Updated for compilation
Cleaned up for threading issues, also added all the methods
Fixed a small bug with threading
Fixed a small bug with threading
Merge remote-tracking branch 'james/master'