Lots of changes/improvements- need to update tests.  This will be part of a minor version release.