This closes #33