Version 1.0 pull from dev to master