Fix some bugs
Merge branch 'master' of github.com:St-Arai/Experiment2-1