Some enhancments to resolve problems occured on usage - utf-8 still need to be fixed