Merge pull request #133 from hazendaz/master

Code Cleanup / Badges / Reporting