benjis commit
Merge branch 'master' into benji
Merge pull request #22 from muduno/benji

Benji