Allowing tornado gen

This pull request also includes my previous one (sorry for it, I messed things up, should be using branches from the start).

If you accept this one, there's no need to accept the previous. If you accept the previous first, let me know and I'll resubmit the pull request.