Added CheckOrigin step. Closed #25