Merge pull request #2 from mxcl/master

Pull from upstream.