Fixed bug with computing initial troop size
Merged with master