Cleanup;
Merge branch 'dev'