Merge #55

Thanks @aerouk

commit 78c9ee01858c55e910e101c8d20d324de2cfe9aa
Author: aerouk
Date:   2013-12-02 23:50:21 +0000

Various fixes in the conversations/ package. [2/?]