Resolved #18