Final changes according to suggestions of Travis