Master update from V1.0