Merge pull request #326 from mlu/master