fixes
Merge pull request #2 from tylrcarr/master

fixes