Final commit

Everything works now
Merge branch 'dev' into gh-pages