Modified travis file
Merge pull request #2 from fercik/master

Modified travis file
Merge pull request #3 from fercik/development

Modified travis file #2