Merge pull request #35 from myama2630/sp60414

Sp60414
Merge pull request #37 from myama2630/sprint6

Merge pull request #35 from myama2630/sp60414