Add Gen.zip, fixes issue #71
Some code cleaning in Prop.scala