Added hotfix
Merge branch '12'
Hotfix for issue #12