Fixes #21
Merge branch 'fix' into dev