Added pre-step before registration, close #35