Merge pull request #6 from changbl/working

Cleanup code
Style cleaning-up
Merge pull request #7 from powerist/working

Style cleaning-up
More cleanup