Dev

Updating Master with all new features, fixes and the name change