Merge branch 'development'
version bump
correctly handle initial connection message