This closes #14