phase2 done
Merge pull request #91 from hanssonr/gh-pages

phase2 done