previous version depended on the below patch, this one does not. It is
also a bit cleaner and has a few more helpful comments.

Ryan Kirkpatrick