Feature/2.x

Pull to update master to v2.0.0