Port to Package object input
Merge pull request #86 from rterbush/first-class-calc-port

Port to Package object input