Resolved #110