Add missing files to the monoD solution
improve assert that can be evalued at compile time
Merge branch 'upstream/master'