updated to 0.6.4
Merge pull request #1235 from rgripper/master

updated to 0.6.4