updates
Merge branch 'master' of ssh://git.dcc.fc.up.pt/yap-6.3