Dev

merging dev into master, crossing fingers