New version, minor bug fixes