modified to include sampling from uniform and normal
Merge remote-tracking branch 'origin/master'