Merge pull request #194 from Alex-Diez/BETA_0_0

Different fixes
Merge pull request #195 from Alex-Diez/BETA_0_0

Develop message container