This closes #160