improved assertions
Merge branch 'master' of https://github.com/smbachman/whisper.git