Merge pull request #328 from mlu/master