Merge pull request #36 from eyrelzy/master

Merge pull request #4 from 11693-01/master