fix for NPE, cloes #25
adding travis