Commit #2
Merge pull request #2 from magwalk/master

Commit #2