Make constraints always unmodifiable, if possible
Merge branch 'master' of github.com:sbebo/MMF