Awesome work! Sent a couple of pull requests in :)