Added optional strict constraint test
Merge remote branch 'origin/master' into HEAD
Lots of stuff