Hotfix/issue #104

Merges #104