PR for dev_1.0

Err, did you mean line 37 and 43?