more correct way to determine what is carried and held
Merge pull request #225 from wriley/carry2

more correct way to determine what is carried and held