Resolved #56