Resolved #108