Bug/#176

Same without the 0.10 version of the framework

added 19 commits

• 7f23ae42...f530767b - 18 commits from branch master
• de0d2f75 - Merge branch 'master' into bug/#176 (closed)

Compare with previous version

merged

mentioned in commit a2fbf1d8