Resolved #18, Resolved #21