cleaned up the repo a bit
Merge branch 'dev'