Merge pull request #51 from Hacks4Snacks/master