Hammertime!
Merge pull request #167 from kleinerm/master

Hammertime!