Initial work for Issue #122
Merge branch 'master' of https://github.com/jwendl/Badge-Application