merging dev into master for new version release