fixes2
Merge pull request #75 from evanwilson/master

fixes2