Fixes and closes issue #25