Merge pull request #327 from mlu/master