Merge pull request #6 from firzhan/master

added threadlocalcontext
Merge remote-tracking branch 'upstream/master'