ConsciousHacker Merge pull request #1 from japesinator/master

Merging JP's changes

Latest commit 2a323c1

Feb 20, 2015