Code refactoring + some small fixes
Merge pull request #8 from zjklee/master

Code refactoring + some small fixes