Added rollback capaility.
Merge pull request #172 from nwinklareth/v2.0-dev

Added rollback capability.