This is a significant improvement to the first version - View it on GitHub