Worked on #104. Resolved #105.