version3 commit
fix conflict between version3 and version4 branch and working directory
fix merge
Merge pull request #2 from mgh14/version3

version3 commit