Added axis titles
Merge branch 'dev' into gh-pages