New version including several bug fixes