Forked to fix PR large comment issue - View it on GitHub