Commit version 0.6