Merge pull request #5 from AlexanderNaehring/master

backmerge
bugfixing

Client conID check
Merge pull request #6 from AlexanderNaehring/dev

pre-session merge