This closes #30