closes #74
Merge branch 'develop' into 1.x-stable