Dev 1.0

Pull Request by Charmelle