Merge pull request #6 from le717/gh-pages

Various fixes and improvements