- fix what should be fixed
- do some refactor
Merge pull request #2 from novalagung/master

- fix what should be fixed