Only master is built by travis [ci-skip]
Little refactoring