Hopefully closes #33.