Merge pull request #33 from GsDevKit/dev

sync dev with master
Merge pull request #25 from GsDevKit/master

sync recent master changes ...
Merge branch 'master' into gemtalk