I'll check the source soon in next days and will make the proposed changes in it.

—
Reply to this email directly or view it on GitHub.