Merge pull request #4 from Tim-Snow/master

ok
Merge pull request #6 from Tim-Snow/personal

Merge pull request #4 from Tim-Snow/master