Hotfix/issue 28 and 30