Changed reference to constants instead of implicit value.
More value changes
Merge pull request #7 from Shane-IL/Work

Merged value changes