Fixes #19
Merge branch 'devel' into auth