fixes #41
fixes #42
fixes #43
Merge branch 'develop' into 1.x-stable
condition fix