Added rollback, preliminary commit for v1.1
Version 1.1