updated
updated
Merge branch 'master' of https://github.com/riklas/Claculate.git