This closes #705