Merge pull request #1 from 11693-01/master

Merge pull request #30 from eyrelzy/master