Merge pull request #1 from l-lin/gh-pages

Merge master from gh-pages
Complete README.md + correct links
Merge pull request #2 from l-lin/master

Merge gh-pages from master