PR for dev_1.0

Yep, hehe forgot about magic numbers. :sweat_smile: Thank you!