merge dev into master

merged working dev into master branch