Resolved #30