Pulled the latest version of the semaphore branch on Peter's instruction.