Resolved #23.