Fix #37: Add orphan option in checkout