Revert "Revert "Merge pull request #10 from sanemat/feature/travis-use-2......-1-0""

This reverts commit dcbba334c8b686ac1d61b17eae109cfabd679349.