don't let timmy unhappy
Merge pull request #1 from howmany/pullReq

pull request