Merge Dev branch

Merges Dev Branch with master