Merge pull request #3 from mengzhuo/master

Update for GS3.6
Merge pull request #4 from mengzhuo/master

Quick Fix for incompatible under 3.6
Fix some styling issues