Use constants instead of #define for parameters
Merge branch 'constants'