merging with
https://github.com/Flowdalic/Smack/commit/d8c77de785eb42ba8f58f8f703573b01b5f10ac2