Merge pull request #423 from micmac1/ast16-semaphores