Merge pull request #324 from mlu/master