This closes #56