ISemaphore cleanup
Merge pull request #1639 from pveentjer/cleanup/semaphore

ISemaphore cleanup