added calculator for L05
Merge branch 'localtest'