Merge pull request #38 from eyrelzy/master

Merge pull request #6 from 11693-01/master