Fix notice if the vars is undefined
Update Travis options
Merge pull request #1 from Zoddo/develop

updating ....