Compiles now
Merge branches 'dev' and 'master'
Merge branches 'master' and 'dev' into dev