Merge pull request #20 from aasaru/fix-travis-builds-failing-at-develop