Resolved #37.