V1.0.1

Pull to allow merge with master