Fix #181
Merge branch 'XMPP-FTW' into dev