Removing magic numbers
Merge master