cleanup
Merge branch 'term'