Inital work on #2, only small things left for next release ;)