Merge branch 'master' into fix_typo
authorManHyuk <manhyuk@kw.ac.kr>
Sun, 27 May 2018 07:03:14 +0000 (16:03 +0900)
committerManHyuk <manhyuk@kw.ac.kr>
Sun, 27 May 2018 07:03:14 +0000 (16:03 +0900)

Trivial merge