version1.2

version1.2
Merge pull request #2 from porter1/master

version1.2