Merge pull request #29 from woodchucks-2014/pre_rollback

Pre rollback