added makefile call to build and travis.yml file
Merge branch 'develop'