Closes schtunt/simbol#1
Merge branch 'hotfix/1' into develop