Merge branch 'develop' into ofertie/refactor

To incorporate changes introduced in version 0.26