Merge pull request #1 from InforMeApps/master

Merge pull request #3 from TheCanadainBrownie/master