Merge changes from latest version of SBV

Includes changes after LeventErkok/sbv@55a9405954b02c30bfa0f0f237b157a42a1af63b (Aug 28)
and up to LeventErkok/sbv@67656c6abad7a25b2626fa52d1a16003dff5294d (Nov 3)

Fixes #135.