fixing issues with o2o rewrites
Merge pull request #4 from voceconnect/fixing_rewrites

fixing issues with o2o rewrites