bug with non-img elts fixed
Merge branch 'develop'