merge branch

Merge branches from test to master
Merge pull request #5 from juncgu/test

merge branch2