Merge pull request #4 from bh-lay/master

refresh develop branches
Merge pull request #5 from bh-lay/dev

Merge pull request #4 from bh-lay/master