Merge pull request #2 from hazzik/patch-1

Create .travis.yml
Merge remote-tracking branch 'remotes/upstream/master'