fixes
first commit
Merge pull request #1 from jjswan33/master

Fixes