Merge pull request #15 from jirkadanek/travis