Merge pull request #59 from YuriIvanov/assert_bugs

fix some assert bugs