Merge branch 'develop'
Merge branch 'develop'
upping the release number to 0.6.4
Merge branch 'master' into develop