general updates
Merge branch 'master' of https://github.com/encima/eartubes
more general updates