Merge pull request #128 from shaunarundell/master

Fix issue #83 (threadsafe version)  - Pushing play on a trailer while it is loading causes MBT crash
Merge pull request #130 from shaunarundell/master

Fixed Issues #123 & #125