Code review items
Merge branch 'master' into barry
Merge pull request #3 from ssong-van/barry

After code review