please consider merging

I have several improvements that were made a long time ago that were sitting in my bitbucket repository.  I've moved them over to github now.