Resolved #19