Working version - finished fixing the refactoring errors. Updated package version.