Merge pull request #33 from GsDevKit/dev

sync dev with master