Merge pull request #1 from spaceone/master

fixes typos, simplifies code