Changes for local instalation (xtusil@aisa)
Local changes #2