New waiter implementation. Moved to public
Merge pull request #50 from iderikon/master

New waiter implementation. Moved to public