replace constants by static class members
Merge branch 'master' into remaster