Added conveyance calculation to determine DSWSE
Merge remote-tracking branch 'origin/master'