PR for dev_1.0

Avoid magic numbers po. :)