Resolved #56. Resolved #55