Merge branch 'ben'
Merge branch 'ben'
Merge branch 'ben'
Merge branch 'ben'

-- Add the reset option
Nothing fancy
Added documentation