Merge pull request #58 from isn-/master

calculator.capnp style adjusting