added makefile and travis-ci configuration
minor bugfixes