Setting version to 0.6.4
Setting version to 0.6.5-SNAPSHOT
Adding changes arising from Craig's suggestions.