Merged samplecalc() into a Class 'Calculator'
Merge pull request #1 from psachin/master

Merged samplecalc() into a Class 'Calculator'