Merge pull request #1 from tiger2wander/master

I contribute some