fixed generics errors
working version of DiscreteProbabilityDistribution
Merge remote-tracking branch 'origin/master'