PR for dev_1.0

Haven't thought of this. Hehe, thank you.