added assertions
Merge branch 'assertions' into space-deminer