Didnt do any changes after Paul added the FB parser. Just commit is due to some conflict on my version.