Merge remote-tracking branch 'their/master'

Conflicts:
	stats.R
changed to 50
Merge remote-tracking branch 'their/master'
try
Fixed conflict.