changed protocol strcuture
cleanup
cleanup
cleanup
merge branch 'develop'