Fix issue #67, but I'm not sure if it's Twitter's bug.
Merge pull request #68 from shadowglen/master

Fix issue #67, but I'm not sure if it's Twitter's bug.