Issue #11 - Cleaning up some threading issues