Merge pull request #1 from Johnidel/master

hey
Merge pull request #3 from bng8/master

Merge pull request #1 from Johnidel/master