Merge pull request #8 from SuperGroupe/master

Version 1.2
Merge pull request #25 from gz5710/master

Merge pull request #8 from SuperGroupe/master