fixes issues
Merge pull request #16 from jgoley/a-branch

fixes issues