Merge pull request #23 from hogbait/newChange

New change
comments thread safety
Merge pull request #24 from hogbait/thread_safety_comments

comments thread safety
slightly changed
Merge remote-tracking branch 'github/master' into newChange