Hotfix/issue #2

Hotfix for #2