Merge pull request #58 from badnack/master

merging
Merge pull request #62 from badnack/master

Die hard!
Merge remote-tracking branch 'upstream/master'