added 2.5 compatibility
added travis