This closes #19