Some basic improvements.
Merge branch 'feature/branch' into develop
Merge branch 'develop' into gh-pages