Revert "Revert "Merge pull request #51 from mbrock/q""

This reverts commit a6c3d5dd0d9eb7de791e4d675ca43ce0606153c5.