Merge pull request #5 from nivoc/master

Updated and fixed travis.yaml
Merge pull request #6 from nivoc/master

update
Merge pull request #5 from rockhouse/master

udate