Added travis support
Merge remote-tracking branch 'upstream/master'
Merge pull request #3 from yannickl88/master

Added travis support