Merge pull request #127 from acz-icm/master

Changes in protocol buffers model