Reduce use of Magic Numbers in code
Version bump (2.0.1)