Encomendas com observacoes, done
Merge origin/master