merge from keplerproject/copas