merged 'Chris_Master' & fixed bugs