Developed

Pull request Developed to master