Rerolling the patch in #23. Removing 'Needs Review' tag as it was vague.
Done...