Merge pull request #13 from szimmers/ticket130905d_constants

Ticket130905d constants