Resolved #32