SAM #64: Messagerefactoring
Merge pull request #65 from JanHorak/SAM_64

SAM #64: Messagerefactoring
--merged