refactored code
Merge branch 'master' of https://github.com/nukec/string-calculator