Merge pull request #1 from jerryrt/master

build settings update