Develop

Merge of develop branch with user rewrite, thread lookup enhancement