Resolved #34