This closes #132