Constants class updates
Merge pull request #3 from im-frizzy/master

Constants class updates