Merge pull request #1 from autorepo/master

update master to latest
test, after easter
Merge pull request #26 from ytfunpanda/master

test after easter