Merge pull request #1 from globalization/master

urgh god, merging badness on my part