fixed divide by zero , close #61 - #457

Da-man525 wants to merge 2 commits into

fixed divide by zero , close #61#457
Da-man525 wants to merge 2 commits into
ChicoState:mainfrom
Da-man525:notanumber

fixed conflict with upstream