Updated version, to reflect bug fixes