Fixed syntax
Small fixes
Merge branch 'master' of github.com:cnm/inesc_server