Merge pull request #1 from novalagung/master

update
- fix what should be fixed
- do some refactor
Merge branch 'master' into gh-pages