Hotfix/7

Should fix #2, #3 and #7.