Christians GunModelBranch merged with current master

This is Christians GunModelBranch merged with current master