Merge pull request #1 from SupSuper/master

sync
Merge pull request #2 from SupSuper/master

sync
Long names fix
Merge pull request #913 from GixG/UfopediaCraftTitle

Fix for bug report #785