Updated comments and reordered calculations.
Fixed comments
Merge pull request #3 from alisonrclarke/master

Updated docs and reordered calculation