Resolved #75. Resolved #76.