Phase 4 complete
Merge pull request #131 from hanssonr/gh-pages

Phase 4 complete