Merge pull request #3 from SuperGroupe/master

Version 1.2
Merge pull request #16 from gz5710/master

Merge pull request #3 from SuperGroupe/master