Merging master with the feature
Merge branch 'master' of github.com:gems-uff/sapos into work