Merge branch 'dev' into 624_N
fixed category and fixed comment
Merge branch 'dev' into 624_N
Merge pull request #24 from is-valid/624_N

624 n