fixes to be continued
Merge branch 'issue-250' into develop