Merge Efforts

So I noticed you have quite a few enhancements.

If you check the fork graph, you'll actually see that I've got quite a few improvements over @jaredhoyt's branch myself.

Perhaps it might be worth while to merge our code together?