...
Added assertion
Merge branch 'master' into projekt