Merge pull request #1 from novalagung/master

update
Merge branch 'master' into gh-pages