Merge pull request #6 from winstonho/master

Merge pull request #2 from lyDASHsBOK/master