Added some more "personal" touches to the code. Expect a release today!