This closes #136