Reset master to version 0.6