Merge pull request #1 from omrco/fix/a

(master)fixブランチに関して
featureブランチに関して
Merge pull request #6 from omrco/feature/a

(release/dev2)Feature/a