Merge

Merging the Dev branch into master, lets hope all goes well!