Better message detection
merge new files
Merge pull request #20 from elgis/popena-master

Popena master