bumped to version 3.6.1
Merge branch 'develop'