preparing pull request
integrating Christian's changes to support __thread and a grammar issue