centralize constants and bug fix.
Merge pull request #67 from soul2zimate/master

centralize constants and bug fix.