Calculator resource updates
Merge pull request #655 from shutter111/master

Calculator resource updates