Merged feature/common-comment
Fixed typo error