merge master

minor fixes

fix for travis