pull request from repository lupatellimatteo to baasbox (0.8.2)