Bugfix/issue/8