Fix for type
Merge branch 'master' of https://github.com/jdehlin/TwitterSandbox
More fixing