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

version6 diff from master