Force constants to static
Merge pull request #39 from Simon311/master

Force constants to static