DOD: * add asserts to Piotreks branch * merge Piotreks branch to master
DOD: