Removed some 'magic numbers'
Merge remote-tracking branch 'origin/master'