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