wip
Merge pull request #4 from saito400/20141012_add_restart

wip