Fixed a couple compile time issues.
Added missing Semaphore import
Merge pull request #5 from mitchellgordon95/master

More small fixes