still tweaking to get travis-ci working