Fixes for plAvatar
Merge pull request #389 from Mystler/plAvatar

Fixes for plAvatar