thread-safe support
merge with github