Merge pull request #4 from jasonly/master

Don't need it here either.
Merge pull request #5 from jasonly/working

Merge pull request #4 from jasonly/master