Sweet! Tried it out and found two small snags, so I sent two pull requests.