Added some changes for making Travis-CI work