This closes #166