Order now handles NaNs properly. Close #127