Merge pull request #65 from evoskuil/version2

Merge no-protocol into version2