This closes #139