Fixes #44
Merge branch 'devel'