Merge pull request #1 from nazrhyn/master

The results of my review and changes.