Working on revisons/cleaning up
Merge branch 'dev'