Magenic/Badge-Application — pull request #213 by jwendl (2014-05-20 05:16:15+00:00)
Title: Fixing issues related to #210

Please review, make sure I didn't do anything "weird".