Merge Dev to Master

Merge the refactored Dev branch