updates
have to work on this test comparing sorted/unsorted
Merge branch 'master' into aboyoun-coxph