Merge pull request #35 from Dezzles/master

Updates to Debug system and fixed threading issue