fixed tests
Merge branch 'develop'
updated version numbers