Resolved #78