Merge branch 'dev' into 624_N
Remove unnecessary variables
Merge pull request #32 from is-valid/624_N

624 n