0.3

added calculator
Merge remote-tracking branch 'origin/master'