Merge branch 'hotfix/13'

Close #13
Fixes #9
CS fixes
Merge branch 'hotfix/cs-fixes' into develop