per1234 Merge pull request #534 from vctor-c/patch-1