Factorial 1.0
Merge master/master