Making mercenaries look beautiful
Merge origin/test into test