Multiple roll

Pull code into master