version1.2

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

version1.2