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