Simple update
beautify
Merge pull request #1 from marado/master

update gh-pages from master