#4

Yet another change
Merge branch 'dev' into gh-pages