Merge branch 'hotfix/ctrlc148'
Fix #298: "ZeroDivisionError: division by zero"
Merge branch 'hotfix/zerodiv298' into develop