Hotfix for session ID issues
Merge branch 'r4' of https://github.com/rmcauley/rainwave into r4