Assumed issue #46 fixed, confirmed with new unittests. Closes #46.