Merge pull request #1 from SuperGroupe/master

Version 1[From Han]
Version 1.1[From Bruce]
Merge pull request #4 from gz5710/master

Version 1.1[From Bruce]