Fix issues
Merge branch 'master' of https://github.com/alveyworld-dev/calculator