PR for dev_1.0

Didn't see that part 2. Hehe, thank you!