Updated pull-request, solving all the above comments.

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