updated for so.muk.wishket version: 1.1