Added asserts
tqMerge branch 'master' of github.com:regehr/solid_code_ass