Merge pull request #2 from badgeretl/master

Merge to top
Merge pull request #3 from badgeretl/master

Merge from badgeretl working branch
Merge pull request #2 from ihistand/master

Sync up