0.5.1

Pull in 0.5.1