travis
Merge pull request #16 from qnikst/travis-2

travis