Updated version number and divide by 0 issue
Merge branch 'release/1.0.18' into develop