Dev

Merge dev into master for ongoing development stages