Fix4
 more for fix4
Merge pull request #9 from bassman5/feature/fix4

feature/fix4