closes #101 together with issue #115