Merge pull request #392 from xor-gate/travis