Merge pull request #3 from softwareradiosystems/next

Merge latest from srs
Setting default delay back to 0
Merge pull request #4 from suttonpd/next

Next