replaced hardcode with constants
Merge pull request #8 from scopely/fix/constants

replaced hardcode with constants
Merge branch 'master' into feature/SerializationRoundTrip