Applying pull request from kzahirag

Applying pull request from kzahirag