updated version, bug fix