Updated scheme for supportng travis-ci