This closes #109