Merge pull request #2 from jpoon/master

Move some stuff up to the global namespace