Fix #15, fix #17, fix #18 and fix #19
Merge branch 'bugfix-#15-#17-#18-#19' into develop