Merge remote-tracking branch 'qh/master'
Changed 10 to 50.
Merge remote-tracking branch 'their/master'

Conflicts:
	stats.R