Add method to interface
Merge branch 'refactor/calculator'