Polish code style.
Adjust build config.
Merge pull request #30 from ivanzhaowy/master

Merge