fix various stuff
Merge pull request #44 from michaelcontento/master

Fix various stuff
Merge remote-tracking branch 'upstream/master'