Merge pull request #1 from constancegervais/master

Pull Lastest Changes