Merge Game Play 1.0.1.1. with master