Merge pull request #185 from ouah/master