Resolved threading issue.
Merge pull request #84 from MindscapeHQ/Thread-Issue

Resolved threading issue.