various fix
Merge branch 'master' of https://github.com/antoinestevens/prospectr