Bug fix.
Adjust build config.
Merge pull request #16 from ivanzhaowy/master

Merge