Merged with latest Hilary master + fixed conflicts + added author institution