Fixing an assertion-error
Merge branch 'small-fixes' into travis-test