+ added textlist
Merge branch 'master' into net