Commit into the local master

Pull the updated code.