fix conflict
fix conflict
use workspace
fix project settings
Merge pull request #28 from 0x0c/workspace

Workspace
Merge branch 'release/1.0.11'