SASL authentication ending correctly
Fix for #489
Merge pull request #490 from CoryChaplin/fixes

Fix for #489
Merge remote branch 'origin/development' into europnet