Rev to version 0.6, Fix #30