Partial fix for issue #98
Partial work on Issue #83
Merge pull request #29 from Magenic/master

Updating my local fork.
Merge pull request #104 from jwendl/master

Partial work for badge report.