Travis update
Merge pull request #20 from androm3da/master

Travis update