I've got an official v2 branch now...

Let's see if I can make an official v2 build from it now.

- Michael