This closes #29