added calculator simple ws
Merge branch 'dev'

* dev:
  added calculator simple ws