PR for dev_1.0

Avoided. :dizzy_face:  hehe