Use Constants
Merge pull request #230 from WangTaoTheTonic/master

Use Constants