Merge pull request #8 from rubicks/master

travis cometh