Fixed Threading.
Fixed stuff
Merge pull request #2 from Falkirks/master

Fixed Threading.