Addresses #175

Worked on this code during a pairing session today. Hope it helps!