merged recent cufftools to oqtans package