Addressed #62.