#58
fix #58
Merge branch 'feature/#58' into devel