NICK support
Merge branch 'ts6' of github.com:whiskers75/soontm into ts6