Closes schtunt/simbol#4
Merge branch 'hotfix/4'