Merge pull request #6 from TsaiQS/v1

merge from v1