Update version to 0.6.4
Merge branch 'rel-0.6.4' into stable
Pull request #19
Merge branch 'stable'