New version: 0.6.4

Change-Id: I6f68d20416abaedeba2d7d269988229f807bdcef