Merge pull request #186 from jix/ff_xinit_opt