Minor changes, updated version