First stable but messy release
Merge branch 'gh-pages'