Merge branch 'iss_237' into develop
Merge branch 'develop' of https://github.com/chocoteam/Choco3 into develop
Merge branch 'develop' of https://github.com/chocoteam/Choco3 into develop
#253: fix bug