init and merge origin
Merge pull request #1 from Vic020/master

init and merge origin