Now working on v1.0.0.pre6