Merge pull request #73 from Sudyx/master