Refine comments and names
Merge branch 'develop' of github.com:tearne/Sampler into develop