Merge pull request #50 from kevmoo/master

A bunch of stuff