fix for issue #18

maybe we can better name pair_1 and pair._2 so that we know what it stands for?

Possiblly 
val (key, option) = pair