PR for dev_1.0

Forgot about that one.