Pull Request 2 Dev 1.1

Please turn the string 'Thread' into constant po :bow: