fixes for issue1
Merge pull request #2 from blackmenthols/fix-issue1

fixes for issue1