Fixed bugs in patch 4.21
Merge pull request #12 from Ultimeto/patch-12

Fixed bugs in patch 4.21