This closes #106