version2 commit
Merge pull request #1 from mgh14/version2

version2 commit
fix merge