Fix calculator to use Package object as required in 2.0
Merge pull request #85 from rterbush/first-class-calc-port

Fix calculator to use Package object as required in 2.0