Fix assert conditions
Merge pull request #55 from timiblossom/master

Fix assert conditions