Fix for issues #36 and #37
Fix incomplete exception name in updater.py
Add test condition for issue #24
Fix test condition for issue #37
Merge branch 'master' into interposition