Division by 0 protection
Merge branch 'dev'
Version update