Merge pull request #341 from mlu/master