Fixed bug in protocoll.
Merge branch 'test' into dev