Version 0.2.3
Merge branch 'master' into gh-pages