rguillebert Merge pull request #23 from prabhuramachandran/fix-travis