This closes #121