added ammo count
Merge origin/master