approach to fix memory leaks
Merge branch 'master' of https://github.com/magmuell/teamproject

# By Magnus Mueller
# Via Magnus Mueller
* 'master' of https://github.com/magmuell/teamproject:
  introduce calculator