merging changes from pull request
Merge branch 'brucellino-master' into dev