This closes #55 and #56