Merge pull request #862 from mogigoma/master

Mogigoma's First Goodie