Merge pull request #71 from Phoul/master