Merging recent changes from JimHokanson