More mercenary fixes.
Merge pull request #44 from danimrath/master

More mercenary fixes.