Merge branch 'tyfkda-feature/fix-segfault-in-calc'