Improved handling of messages
Merge branch 'master' of https://github.com/Datical/DaticalDB4CARA