Reduced #messages generated
Merge branch 'master' of github.com:xaviercrochet/LINGI2132_DSL