Merge pull request #5 from SuperGroupe/master

Version 1.2
Merge pull request #22 from gz5710/master

Merge pull request #5 from SuperGroupe/master