fixes #212
Merge pull request #217 from vrabaud/fixes_212

fixes #212
Merge branch 'develop', remote-tracking branch 'ecto_origin/develop' into develop