Revert "Refactor of samplers code"
Merge pull request #18 from ProfessorBrunner/revert-17-refactor

Revert "Refactor of samplers code"
Merge remote-tracking branch 'upstream/master' into fix