first version(another minor fix)
Merge branch 'master' of github.com:maxfrei92/calculator