Merge pull request #4 from SuperGroupe/master

Version 1.2
Merge pull request #20 from gz5710/master

Merge pull request #4 from SuperGroupe/master