Commit 0.6.0