Fix calculator impl
Merge pull request #29 from Senjai/2-1-lav-calc

Fix calculator impl