Will make the change and add some tests for this and release the new version.