updated version to address open issues