Version x3f_047
Merge branch 'master' of github-rolkar:rolkar/x3f