Merge pull request #1 from netceler/master

Enhancements / Threadsafe / IT Tests