Merge pull request #2 from evoskuil/develop

_protocol import props