Merge branch 'matthew'

ý5:q
minor changes