Merge pull request #462 from justinweiss/threaded-rendering