Automatic Checkpointing
merged
Merge branch 'HiroSatou-master' into forkfix