lou hyndman update
Merge branch 'lou-hyndman'