bumped to version 3.6.4
Merge branch 'develop'