Likelihood weighting and several querying shortcuts
Merge pull request #189 from apfeffer/DEV2.2

Likelihood weighting and several querying shortcuts