Merge pull request #4 from Tim-Snow/master

ok