Merge pull request #168 from lepture/master