This closes #156