PR for dev_1.0

Didn't see that. Hehe, thank you!