Changed waits into non blocking ones
Merge pull request #61 from StreamComputing/scdev

Changed waits into non blocking ones