Issue #388 - pulling develop and solving conflicts