Some changes made. See README