Merge pull request #3 from wonderflow/master

test merge & pull 10.17