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