Updated to include v0.6.3