Merge branch 'hotfix/0.156'
copying bug fix from develop: fix divide by zero
version bump
Merge branch 'hotfix/0.157' into develop