Merge pull request #2 from lyDASHsBOK/master

mearge
Merge pull request #3 from lyDASHsBOK/master

update
Merge pull request #6 from winstonho/master

Merge pull request #2 from lyDASHsBOK/master