version6 diff from master
Merge pull request #4 from mgh14/version6

version6 diff from master
fix merge issue
Merge branch 'version5' of https://github.com/mgh14/testRepo into version5