Patch 34

Closes #384