Starting fix for #165
Merge branch 'fixingPendingPrekeys'