fixes problems
Merge pull request #15 from jhath16/justin-branch

fixes problems