Merge pull request #1 from wogsland/master

Some updates
Merge pull request #2 from wogsland/master

Setup streamlined & unit tested
Added Code Climate badge
minor edit