Fixed bugs with constrain check.
Merge branch 'master' of https://github.com/Ramqvist/shrdlite-template