add an assertion
Merge remote-tracking branch 'upstream/master'
fix to implementation of suggestion #39