Fixes #140
Merge branch 'support-for-0.9.x' into devel