Merge branch 'master' of https://github.com/GDmac/TwitterOAuth into v1
Merge branch 'master' into v1