some fixes
Some updates
and bux fixes
Some updates
Merge branch 'master' of https://github.com/lastcolour/Calculator