Master to 0.9

hope i got the travis right there.