simplified some code, hopefully fixed travis
Merge pull request #13 from c4ssio/master

simplified some code, hopefully fixed travis