closes #207 - Support rebase