Closes #56