mvk13ogb/qwait — pull request #86 by Schmisk (2014-04-19 10:25:13+00:00)
Title: Rebased initial queue update

Tried rebasing the other PR, and it didn't quite go as planned. Putting up this PR to get feedback on possible errors.