Blocking .wait() should be optional
Merge pull request #8 from joshuakarjala/master

Blocking .wait() should be optional