update calcs
Merge pull request #4 from craigspaeth/master

update calcs