made some changes to be compatible to travis-ci