Properly handle parallel-mode requests

Closes #65