I've done as you said.
http://pastebin.freeswitch.org/6220
I'll try to stay on IRC more.
Thx,
Viktor