diff --git a/App/src/TestMesoCrystal2.cpp b/App/src/TestMesoCrystal2.cpp
index 40c7a075e3493abdc2b01163099cbc002e22db68..4c11ec8a159d35e75731b4ac2f968cca3ca81748 100644
--- a/App/src/TestMesoCrystal2.cpp
+++ b/App/src/TestMesoCrystal2.cpp
@@ -140,7 +140,7 @@ void TestMesoCrystal2::draw_results()
     hist_simu->GetYaxis()->SetTitleOffset(1.35);
     hist_simu->DrawCopy("CONT4 Z");
 
-//    OutputDataIOFactory::writeOutputData(*m_simulation->getOutputData(), "meso_simul.txt");
+    OutputDataIOFactory::writeOutputData(*m_simulation->getOutputData(), "meso_simul.txt");
 //    OutputDataIOFactory::writeOutputData(*m_real_data, "meso_real.txt");
 //    OutputData<double> *tmp_real = OutputDataIOFactory::getOutputData("meso_real.txt");
 //    OutputData<double> *tmp_simul = OutputDataIOFactory::getOutputData("meso_simul.txt");
diff --git a/Tests/FunctionalTests/TestCore/IsGISAXS01/IsGISAXS01.cpp b/Tests/FunctionalTests/TestCore/IsGISAXS01/IsGISAXS01.cpp
index ddbfb8da7f3a65ddf106c523b738e1843f96e97c..ce8dd9146837b8fbbe4b016476494156248b3ee8 100644
--- a/Tests/FunctionalTests/TestCore/IsGISAXS01/IsGISAXS01.cpp
+++ b/Tests/FunctionalTests/TestCore/IsGISAXS01/IsGISAXS01.cpp
@@ -109,7 +109,8 @@ int FunctionalTests::IsGISAXS01::analyseResults()
 
     std::cout << m_name << " " << m_description << " " <<
         (status_ok ? "[OK]" : "[FAILED]") << std::endl;
-    return (int)status_ok;
+
+    return (status_ok ? 0 : 1);
 }
 
 
diff --git a/Tests/FunctionalTests/TestCore/IsGISAXS02/IsGISAXS02.cpp b/Tests/FunctionalTests/TestCore/IsGISAXS02/IsGISAXS02.cpp
index c2609a2e41354d382f6914be070d149358f55d81..57dd0b9d20dcc56d6c5f9bc812d8c0bad295928a 100644
--- a/Tests/FunctionalTests/TestCore/IsGISAXS02/IsGISAXS02.cpp
+++ b/Tests/FunctionalTests/TestCore/IsGISAXS02/IsGISAXS02.cpp
@@ -110,7 +110,8 @@ int FunctionalTests::IsGISAXS02::analyseResults()
     delete reference;
 
     std::cout << m_name << " " << m_description << " " << (status_ok ? "[OK]" : "[FAILED]") << std::endl;
-    return (int)status_ok;
+
+    return (status_ok ? 0 : 1);
 }
 
 #ifdef STANDALONE
diff --git a/Tests/FunctionalTests/TestCore/IsGISAXS03/IsGISAXS03.cpp b/Tests/FunctionalTests/TestCore/IsGISAXS03/IsGISAXS03.cpp
index f1c479bc705cf0d0318a3eaaf83b7a6671530933..176899bb58530766801370ab2a5edd635bc6616e 100644
--- a/Tests/FunctionalTests/TestCore/IsGISAXS03/IsGISAXS03.cpp
+++ b/Tests/FunctionalTests/TestCore/IsGISAXS03/IsGISAXS03.cpp
@@ -157,7 +157,7 @@ int FunctionalTests::IsGISAXS03::analyseResults()
     }
 
     std::cout << m_name << " " << m_description << " " << (status_ok ? "[OK]" : "[FAILED]") << std::endl;
-    return (int)status_ok;
+    return (status_ok ? 0 : 1);
 }
 
 
diff --git a/Tests/FunctionalTests/TestCore/IsGISAXS04/IsGISAXS04.cpp b/Tests/FunctionalTests/TestCore/IsGISAXS04/IsGISAXS04.cpp
index 964bd16f77e2ebdb28191ccb4051f9d62cb93006..3b3e9baaab471dbde7459e9447faf7f427cdbea3 100644
--- a/Tests/FunctionalTests/TestCore/IsGISAXS04/IsGISAXS04.cpp
+++ b/Tests/FunctionalTests/TestCore/IsGISAXS04/IsGISAXS04.cpp
@@ -123,7 +123,8 @@ int FunctionalTests::IsGISAXS04::analyseResults()
     }
 
     std::cout << m_name << " " << m_description << " " << (status_ok ? "[OK]" : "[FAILED]") << std::endl;
-    return (int)status_ok;
+    return (status_ok ? 0 : 1);
+
 }
 
 
diff --git a/Tests/FunctionalTests/TestCore/IsGISAXS06/IsGISAXS06.cpp b/Tests/FunctionalTests/TestCore/IsGISAXS06/IsGISAXS06.cpp
index 5ebb9499e3e42a0c014f9303514fb8afa72fc248..43cd99be9f521b27700c199885620d23aca7b283 100644
--- a/Tests/FunctionalTests/TestCore/IsGISAXS06/IsGISAXS06.cpp
+++ b/Tests/FunctionalTests/TestCore/IsGISAXS06/IsGISAXS06.cpp
@@ -317,7 +317,7 @@ int FunctionalTests::IsGISAXS06::analyseResults()
     }
 
     std::cout << m_name << " " << m_description << " " << (status_ok ? "[OK]" : "[FAILED]") << std::endl;
-    return (int)status_ok;
+    return (status_ok ? 0 : 1);
 }
 
 
diff --git a/Tests/FunctionalTests/TestCore/IsGISAXS07/IsGISAXS07.cpp b/Tests/FunctionalTests/TestCore/IsGISAXS07/IsGISAXS07.cpp
index e1f94991866660594a613f2d67552184c9d1a93b..656cea493393154121689db520d26fcbde4b9335 100644
--- a/Tests/FunctionalTests/TestCore/IsGISAXS07/IsGISAXS07.cpp
+++ b/Tests/FunctionalTests/TestCore/IsGISAXS07/IsGISAXS07.cpp
@@ -138,8 +138,7 @@ int FunctionalTests::IsGISAXS07::analyseResults()
     if( diff > threshold || std::isnan(diff)) status_ok=false;
 
     std::cout << m_name << " " << m_description << " " << (status_ok ? "[OK]" : "[FAILED]") << std::endl;
-    return (int)status_ok;
-
+    return (status_ok ? 0 : 1);
 }
 
 #ifdef STANDALONE
diff --git a/Tests/FunctionalTests/TestCore/IsGISAXS08/IsGISAXS08.cpp b/Tests/FunctionalTests/TestCore/IsGISAXS08/IsGISAXS08.cpp
index 2e401aef47b5db01b05aea3388b1725c731f4dd1..fc465622b543da87d9075d55530d59533a7ff868 100644
--- a/Tests/FunctionalTests/TestCore/IsGISAXS08/IsGISAXS08.cpp
+++ b/Tests/FunctionalTests/TestCore/IsGISAXS08/IsGISAXS08.cpp
@@ -127,8 +127,7 @@ int FunctionalTests::IsGISAXS08::analyseResults()
     }
 
     std::cout << m_name << " " << m_description << " " << (status_ok ? "[OK]" : "[FAILED]") << std::endl;
-    return (int)status_ok;
-
+    return (status_ok ? 0 : 1);
 }
 
 
diff --git a/Tests/FunctionalTests/TestCore/IsGISAXS09/IsGISAXS09.cpp b/Tests/FunctionalTests/TestCore/IsGISAXS09/IsGISAXS09.cpp
index 48fdcb7f46b3c745001cacf80aa59e5dbc0776dd..12ca36d4b880a2673211cd593642c760b7040bed 100644
--- a/Tests/FunctionalTests/TestCore/IsGISAXS09/IsGISAXS09.cpp
+++ b/Tests/FunctionalTests/TestCore/IsGISAXS09/IsGISAXS09.cpp
@@ -129,7 +129,7 @@ int FunctionalTests::IsGISAXS09::analyseResults()
     }
 
     std::cout << m_name << " " << m_description << " " << (status_ok ? "[OK]" : "[FAILED]") << std::endl;
-    return (int)status_ok;
+    return (status_ok ? 0 : 1);
 }
 
 
diff --git a/Tests/FunctionalTests/TestCore/IsGISAXS10/IsGISAXS10.cpp b/Tests/FunctionalTests/TestCore/IsGISAXS10/IsGISAXS10.cpp
index a3436eba9161edebe9d89e3e3b07c8ff2bf655a1..a1e183316cdb21b3d108c68776c52b7445614b96 100644
--- a/Tests/FunctionalTests/TestCore/IsGISAXS10/IsGISAXS10.cpp
+++ b/Tests/FunctionalTests/TestCore/IsGISAXS10/IsGISAXS10.cpp
@@ -76,7 +76,7 @@ int FunctionalTests::IsGISAXS10::analyseResults()
     delete reference;
 
     std::cout << m_name << " " << m_description << " " << (status_ok ? "[OK]" : "[FAILED]") << std::endl;
-    return (int)status_ok;
+    return (status_ok ? 0 : 1);
 }
 
 
diff --git a/Tests/FunctionalTests/TestCore/IsGISAXS11/IsGISAXS11.cpp b/Tests/FunctionalTests/TestCore/IsGISAXS11/IsGISAXS11.cpp
index e57a83616cf0076e3ba8ccd310f134f87824ce0f..b20121aad8928910dcf8545a5e3b6056a9bf1a6c 100644
--- a/Tests/FunctionalTests/TestCore/IsGISAXS11/IsGISAXS11.cpp
+++ b/Tests/FunctionalTests/TestCore/IsGISAXS11/IsGISAXS11.cpp
@@ -79,7 +79,7 @@ int FunctionalTests::IsGISAXS11::analyseResults()
     delete reference;
 
     std::cout << m_name << " " << m_description << " " << (status_ok ? "[OK]" : "[FAILED]") << std::endl;
-    return (int)status_ok;
+    return (status_ok ? 0 : 1);
 }
 
 
diff --git a/Tests/FunctionalTests/TestCore/IsGISAXS15/IsGISAXS15.cpp b/Tests/FunctionalTests/TestCore/IsGISAXS15/IsGISAXS15.cpp
index b1d0f119bbbd222c0448c93ded95a103c777796c..f35bfc972be6e55169f40fa654be4c1fb018f701 100644
--- a/Tests/FunctionalTests/TestCore/IsGISAXS15/IsGISAXS15.cpp
+++ b/Tests/FunctionalTests/TestCore/IsGISAXS15/IsGISAXS15.cpp
@@ -88,7 +88,7 @@ int FunctionalTests::IsGISAXS15::analyseResults()
     if( diff > threshold || std::isnan(diff)) status_ok=false;
 
     std::cout << m_name << " " << m_description << " " << (status_ok ? "[OK]" : "[FAILED]") << std::endl;
-    return (int)status_ok;
+    return (status_ok ? 0 : 1);
 }
 
 
diff --git a/Tests/FunctionalTests/TestCore/MesoCrystal1/MesoCrystal1.cpp b/Tests/FunctionalTests/TestCore/MesoCrystal1/MesoCrystal1.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..1384a94e60c8fbd0742e5d4e478767ec14740922
--- /dev/null
+++ b/Tests/FunctionalTests/TestCore/MesoCrystal1/MesoCrystal1.cpp
@@ -0,0 +1,100 @@
+#include "MesoCrystal1.h"
+#include "SampleBuilder.h"
+
+#include "Simulation.h"
+#include "ResolutionFunction2DSimple.h"
+#include "OutputDataIOFactory.h"
+#include "Utils.h"
+#include "Units.h"
+#include "Types.h"
+
+using namespace FunctionalTests;
+
+
+
+MesoCrystal1::MesoCrystal1()
+    : m_test_name("MesoCrystal1")
+    , m_test_description("Meso crystal simulation")
+{ }
+
+
+MesoCrystal1::~MesoCrystal1()
+{ }
+
+
+int MesoCrystal1::MesoCrystal1::run()
+{
+    // setting up sample and simulation
+    SampleBuilder *sample_builder = new SampleBuilder();
+    Simulation *simulation = createSimulation();
+    simulation->setSampleBuilder( sample_builder );
+
+    // loading reference data
+    std::string filename = Utils::FileSystem::GetHomePath() +
+        "/Tests/FunctionalTests/TestCore/MesoCrystal1/mesocrystal1_reference.txt.gz";
+    OutputData<double > *reference_data = OutputDataIOFactory::getOutputData(filename);
+
+    // setting detector axis as in reference data
+    simulation->setDetectorParameters(*reference_data);
+
+    //running simulation
+    simulation->runSimulation();
+    simulation->normalize();
+    OutputData<double > *result = simulation->getOutputDataClone();
+
+    // analysing results
+    double diff = getDifference(result, reference_data);
+    const double threshold(1e-10);
+    bool status_ok(true);
+    if( diff > threshold || std::isnan(diff) ) status_ok=false;
+
+    delete sample_builder;
+    delete simulation;
+    delete result;
+    delete reference_data;
+
+    std::cout << m_test_name << " " << m_test_description << " " <<
+        (status_ok ? "[OK]" : "[FAILED]") << std::endl;
+
+    return (status_ok ? 0 : 1);
+}
+
+
+double MesoCrystal1::getDifference(OutputData<double> *result, const OutputData<double> *reference)
+{
+    double diff(0);
+    // Calculating average relative difference.
+    *result -= *reference;
+    *result /= *reference;
+    for(OutputData<double>::const_iterator it =
+            result->begin(); it!=result->end(); ++it) {
+        diff+= std::fabs(*it);
+    }
+    diff /= result->getAllocatedSize();
+    return diff;
+}
+
+
+// create simulation
+Simulation *MesoCrystal1::createSimulation()
+{
+    Simulation *simulation = new Simulation();
+    simulation = new Simulation();
+    simulation->setBeamParameters(1.77*Units::angstrom, -0.4*Units::degree, 0.0*Units::degree);
+    simulation->setBeamIntensity(5.0090e+12);
+    simulation->setDetectorResolutionFunction(new ResolutionFunction2DSimple(0.0002, 0.0002));
+    return simulation;
+}
+
+
+
+
+#ifdef STANDALONE
+int main()
+{
+    //Utils::EnableFloatingPointExceptions();
+    FunctionalTests::MesoCrystal1 test;
+    return test.run();
+}
+#endif
+
diff --git a/Tests/FunctionalTests/TestCore/MesoCrystal1/MesoCrystal1.h b/Tests/FunctionalTests/TestCore/MesoCrystal1/MesoCrystal1.h
new file mode 100644
index 0000000000000000000000000000000000000000..a9d9bb9337bf35e651be14ce7d39d8d2ac75dab7
--- /dev/null
+++ b/Tests/FunctionalTests/TestCore/MesoCrystal1/MesoCrystal1.h
@@ -0,0 +1,39 @@
+#ifndef _TESTMESOCRYSTAL1_H
+#define _TESTMESOCRYSTAL1_H
+
+#include "ISampleBuilder.h"
+#include "OutputData.h"
+#include <string>
+#include <vector>
+
+class ISample;
+class Simulation;
+#include "OutputData.h"
+
+
+namespace FunctionalTests {
+
+//! functional test: mesocrystal simulation
+
+class MesoCrystal1
+{
+public:
+    MesoCrystal1();
+    ~MesoCrystal1();
+
+    //! run fitting
+    int run();
+
+private:
+
+    Simulation *createSimulation();
+    double getDifference(OutputData<double> *result, const OutputData<double> *reference);
+
+    std::string m_test_name;
+    std::string m_test_description;
+};
+
+}
+
+
+#endif
diff --git a/Tests/FunctionalTests/TestCore/MesoCrystal1/MesoCrystal1.pro b/Tests/FunctionalTests/TestCore/MesoCrystal1/MesoCrystal1.pro
new file mode 100644
index 0000000000000000000000000000000000000000..92d665802101b07db2bde16b3906e84467c5886d
--- /dev/null
+++ b/Tests/FunctionalTests/TestCore/MesoCrystal1/MesoCrystal1.pro
@@ -0,0 +1,13 @@
+TEMPLATE = app
+CONFIG  += console
+CONFIG  -= qt app_bundle
+QT      -= core gui
+
+include($$PWD/../../../../shared.pri)
+DEFINES += STANDALONE
+LIBS += $$PWD/../../../../lib/libBornAgainCore.so
+
+SOURCES += MesoCrystal1.cpp SampleBuilder.cpp
+HEADERS += MesoCrystal1.h SampleBuilder.h
+
+
diff --git a/Tests/FunctionalTests/TestCore/MesoCrystal1/SampleBuilder.cpp b/Tests/FunctionalTests/TestCore/MesoCrystal1/SampleBuilder.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..5f2eed1ce6f0ff0e5dd69a64c9c6dd6df355cea6
--- /dev/null
+++ b/Tests/FunctionalTests/TestCore/MesoCrystal1/SampleBuilder.cpp
@@ -0,0 +1,140 @@
+#include "SampleBuilder.h"
+#include "FormFactorCylinder.h"
+#include "FormFactorDecoratorDebyeWaller.h"
+#include "MultiLayer.h"
+#include "InterferenceFunctions.h"
+#include "Crystal.h"
+#include "MesoCrystal.h"
+#include "ParticleDecoration.h"
+#include "LayerDecorator.h"
+#include "Units.h"
+#include "MaterialManager.h"
+#include "FormFactorSphereGaussianRadius.h"
+
+using namespace FunctionalTests;
+
+
+SampleBuilder::SampleBuilder()
+    : m_lattice_length_a(6.2091e+00*Units::nanometer)
+    , m_lattice_length_c(6.5677e+00*Units::nanometer)
+    , m_nanoparticle_radius(4.6976e+00*Units::nanometer)
+    , m_sigma_nanoparticle_radius(3.6720e-01*Units::nanometer)
+    , m_meso_height(1.1221e+02*Units::nanometer)
+    , m_meso_radius(9.4567e+02*Units::nanometer)
+    , m_sigma_meso_height(1.3310e+00*Units::nanometer)
+    , m_sigma_meso_radius(1.3863e+00*Units::nanometer)
+    , m_sigma_lattice_length_a(1.1601e+00*Units::nanometer)
+    , m_surface_filling_ratio(1.7286e-01)
+    , m_roughness(2.8746e+01*Units::nanometer)
+{
+    init_parameters();
+}
+
+
+// create mesocrystal
+ISample* SampleBuilder::buildSample() const
+{
+    double surface_density = m_surface_filling_ratio/M_PI/m_meso_radius/m_meso_radius;
+    complex_t n_particle(1.0-2.84e-5, 4.7e-7); // data from http://henke.lbl.gov/optical_constants/getdb2.html
+    complex_t avg_n_squared_meso = 0.7886*n_particle*n_particle + 0.2114;
+    complex_t n_avg = std::sqrt(m_surface_filling_ratio*avg_n_squared_meso + 1.0 - m_surface_filling_ratio);
+    complex_t n_particle_adapted = std::sqrt(n_avg*n_avg + n_particle*n_particle - 1.0);
+    FormFactorCylinder ff_cyl(m_meso_height, m_meso_radius);
+    FormFactorDecoratorDebyeWaller ff_meso(ff_cyl.clone(), m_sigma_meso_height*m_sigma_meso_height/2.0, m_sigma_meso_radius*m_sigma_meso_radius/2.0);
+
+    // Create multilayer
+    MultiLayer *p_multi_layer = new MultiLayer();
+    complex_t n_air(1.0, 0.0);
+    complex_t n_substrate(1.0-7.57e-6, 1.73e-7);
+
+    const IMaterial *p_air_material = MaterialManager::getHomogeneousMaterial("Air", n_air);
+    const IMaterial *p_average_layer_material = MaterialManager::getHomogeneousMaterial("Averagelayer", n_avg);
+    const IMaterial *p_substrate_material = MaterialManager::getHomogeneousMaterial("Substrate", n_substrate);
+    Layer air_layer;
+    air_layer.setMaterial(p_air_material);
+    Layer avg_layer;
+    avg_layer.setMaterial(p_average_layer_material);
+    avg_layer.setThickness(m_meso_height);
+    Layer substrate_layer;
+    substrate_layer.setMaterial(p_substrate_material);
+    IInterferenceFunction *p_interference_funtion = new InterferenceFunctionNone();
+    ParticleDecoration particle_decoration;
+    size_t n_max_phi_rotation_steps = 180;
+    size_t n_alpha_rotation_steps = 1;
+
+    double alpha_step = 5.0*Units::degree/n_alpha_rotation_steps;
+    double alpha_start = - (n_alpha_rotation_steps/2.0)*alpha_step;
+
+    double phi_step = 2*M_PI/3.0/n_max_phi_rotation_steps;
+    double phi_start = 0.0;
+    for (size_t i=0; i<n_max_phi_rotation_steps; ++i) {
+        for (size_t j=0; j<n_alpha_rotation_steps; ++j) {
+            Geometry::RotateZ3D transform1(phi_start + (double)i*phi_step);
+            Geometry::RotateY3D transform2(alpha_start + j*alpha_step);
+            Geometry::Transform3D *p_total_transform = new Geometry::Transform3D(transform1);
+            particle_decoration.addParticle(createMesoCrystal(m_lattice_length_a, m_lattice_length_c,
+                    n_particle_adapted,& ff_meso), p_total_transform, m_meso_height);
+        }
+    }
+
+    particle_decoration.setTotalParticleSurfaceDensity(surface_density);
+    particle_decoration.addInterferenceFunction(p_interference_funtion);
+    LayerDecorator avg_layer_decorator(avg_layer, particle_decoration);
+
+    LayerRoughness roughness(m_roughness, 0.3, 500.0*Units::nanometer);
+
+    p_multi_layer->addLayer(air_layer);
+    p_multi_layer->addLayer(avg_layer_decorator);
+    p_multi_layer->addLayerWithTopRoughness(substrate_layer, roughness);
+
+    return p_multi_layer;
+}
+
+
+void SampleBuilder::init_parameters()
+{
+    clearParameterPool();
+    registerParameter("meso_radius",& m_meso_radius);
+    registerParameter("surface_filling_ratio",& m_surface_filling_ratio);
+    registerParameter("meso_height",& m_meso_height);
+    registerParameter("sigma_meso_height",& m_sigma_meso_height);
+    registerParameter("sigma_meso_radius",& m_sigma_meso_radius);
+    registerParameter("lattice_length_a",& m_lattice_length_a);
+    registerParameter("lattice_length_c",& m_lattice_length_c);
+    registerParameter("nanoparticle_radius",& m_nanoparticle_radius);
+    registerParameter("sigma_nanoparticle_radius",& m_sigma_nanoparticle_radius);
+    registerParameter("sigma_lattice_length_a",& m_sigma_lattice_length_a);
+    registerParameter("roughness",& m_roughness);
+}
+
+
+MesoCrystal* SampleBuilder::createMesoCrystal(double stacking_radius_a, double stacking_radius_c, complex_t n_particle,
+        const IFormFactor* p_meso_form_factor) const
+{
+    const Lattice *p_lat = createLattice(stacking_radius_a, stacking_radius_c);
+    kvector_t bas_a = p_lat->getBasisVectorA();
+    kvector_t bas_b = p_lat->getBasisVectorB();
+    kvector_t bas_c = p_lat->getBasisVectorC();
+    Particle particle(n_particle, new FormFactorSphereGaussianRadius(m_nanoparticle_radius, m_sigma_nanoparticle_radius));
+    kvector_t position_0 = kvector_t(0.0, 0.0, 0.0);
+    kvector_t position_1 = 1.0/3.0*(2.0*bas_a + bas_b + bas_c);
+    kvector_t position_2 = 1.0/3.0*(bas_a + 2.0*bas_b + 2.0*bas_c);
+    std::vector<kvector_t> pos_vector;
+    pos_vector.push_back(position_0);
+    pos_vector.push_back(position_1);
+    pos_vector.push_back(position_2);
+    LatticeBasis basis(particle, pos_vector);
+
+    Crystal npc(basis, *p_lat);
+    delete p_lat;
+    double dw_factor = m_sigma_lattice_length_a*m_sigma_lattice_length_a/6.0;
+    npc.setDWFactor(dw_factor);
+    return new MesoCrystal(npc.clone(), p_meso_form_factor->clone());
+}
+
+const Lattice *SampleBuilder::createLattice(double stacking_radius_a, double stacking_radius_c) const
+{
+    Lattice *p_result = new Lattice(Lattice::createTrigonalLattice(stacking_radius_a*2.0, stacking_radius_c*2.0*2.3));
+    p_result->setSelectionRule(SimpleSelectionRule(-1, 1, 1, 3));
+    return p_result;
+}
diff --git a/Tests/FunctionalTests/TestCore/MesoCrystal1/SampleBuilder.h b/Tests/FunctionalTests/TestCore/MesoCrystal1/SampleBuilder.h
new file mode 100644
index 0000000000000000000000000000000000000000..cfd96057a88b5d1f4b5fc096fe53c176d26e3d96
--- /dev/null
+++ b/Tests/FunctionalTests/TestCore/MesoCrystal1/SampleBuilder.h
@@ -0,0 +1,45 @@
+#ifndef MESOSAMPLEBUILDER_H
+#define MESOSAMPLEBUILDER_H
+
+#include "ISampleBuilder.h"
+#include "Types.h"
+class MesoCrystal;
+class Lattice;
+class IFormFactor;
+
+namespace FunctionalTests {
+
+//! Builds sample using set of input parameters.
+//! Mesocrystal of cylindrical shape composed by sperical nanoparticles
+//! at FCC lattice points
+class SampleBuilder : public ISampleBuilder
+{
+public:
+    SampleBuilder();
+
+    virtual ~SampleBuilder(){}
+    virtual ISample *buildSample() const;
+
+protected:
+    virtual void init_parameters();
+private:
+    MesoCrystal *createMesoCrystal(double stacking_radius_a, double stacking_radius_c, complex_t n_particle, const IFormFactor *p_meso_form_factor) const;
+    const Lattice *createLattice(double stacking_radius_a, double stacking_radius_c) const;
+    double m_lattice_length_a;
+    double m_lattice_length_c;
+    double m_nanoparticle_radius;
+    double m_sigma_nanoparticle_radius;
+    double m_meso_height;
+    double m_meso_radius;
+    double m_sigma_meso_height;
+    double m_sigma_meso_radius;
+    double m_sigma_lattice_length_a;
+    double m_surface_filling_ratio;
+    double m_roughness;
+};
+
+}
+
+
+
+#endif // SAMPLEBUILDER_H
diff --git a/Tests/FunctionalTests/TestCore/MesoCrystal1/mesocrystal1_reference.txt.gz b/Tests/FunctionalTests/TestCore/MesoCrystal1/mesocrystal1_reference.txt.gz
new file mode 100644
index 0000000000000000000000000000000000000000..7913653adf3694fde6fa8bd13fb8e457c1cafa7d
Binary files /dev/null and b/Tests/FunctionalTests/TestCore/MesoCrystal1/mesocrystal1_reference.txt.gz differ
diff --git a/Tests/FunctionalTests/TestCore/README b/Tests/FunctionalTests/TestCore/README
index 6942121e934b0fc84ab444aae286970e3ae379d7..03ef117ed7c851c13cbf8881edfb9cf4d28b636a 100644
--- a/Tests/FunctionalTests/TestCore/README
+++ b/Tests/FunctionalTests/TestCore/README
@@ -10,14 +10,15 @@ To run tests
 python TestCore.py
 
 List of tests
-IsGISAXS01 - Mixture of cylinders and prisms without interference (IsGISAXS example #1)
-IsGISAXS02 - Mixture cylinder particles with different size distribution (IsGISAXS example #2)
-IsGISAXS03 - Cylinder formfactor in BA and DWBA (IsGISAXS example #3)
-IsGISAXS04 - 1D and 2D paracrystal (IsGISAXS example #4)
-IsGISAXS06 - 2D lattice with different disorder (IsGISAXS example #6)
-IsGISAXS07 - Mixture of different particles defined in morphology file (IsGISAXS example #7)
-IsGISAXS08 - 2DDL paracrystal (IsGISAXS example #8)
-IsGISAXS09 - Pyramids on top of substrate - Rotated pyramids on top of substrate (IsGISAXS example #9)
-IsGISAXS10 - Cylinders with interference on top of substrate (IsGISAXS example #10)
-IsGISAXS11 - Core shell nanoparticles (IsGISAXS example #11)
-IsGISAXS15 - Size spacing correlation approximation (IsGISAXS example #15)
+IsGISAXS01   - Mixture of cylinders and prisms without interference (IsGISAXS example #1)
+IsGISAXS02   - Mixture cylinder particles with different size distribution (IsGISAXS example #2)
+IsGISAXS03   - Cylinder formfactor in BA and DWBA (IsGISAXS example #3)
+IsGISAXS04   - 1D and 2D paracrystal (IsGISAXS example #4)
+IsGISAXS06   - 2D lattice with different disorder (IsGISAXS example #6)
+IsGISAXS07   - Mixture of different particles defined in morphology file (IsGISAXS example #7)
+IsGISAXS08   - 2DDL paracrystal (IsGISAXS example #8)
+IsGISAXS09   - Pyramids on top of substrate - Rotated pyramids on top of substrate (IsGISAXS example #9)
+IsGISAXS10   - Cylinders with interference on top of substrate (IsGISAXS example #10)
+IsGISAXS11   - Core shell nanoparticles (IsGISAXS example #11)
+IsGISAXS15   - Size spacing correlation approximation (IsGISAXS example #15)
+MesoCrystal1 - Meso crystal simulation
diff --git a/Tests/FunctionalTests/TestCore/TestCore.pro b/Tests/FunctionalTests/TestCore/TestCore.pro
index f359003ac3b62c9e04bb65adba052bf954e8027d..d5cd8b0d8ab066f4174d71259caade0e2433189e 100644
--- a/Tests/FunctionalTests/TestCore/TestCore.pro
+++ b/Tests/FunctionalTests/TestCore/TestCore.pro
@@ -12,6 +12,7 @@ SUBDIRS += \
     IsGISAXS09 \
     IsGISAXS10 \
     IsGISAXS11 \
-    IsGISAXS15
+    IsGISAXS15 \
+    MesoCrystal1
 
 CONFIG += ordered
diff --git a/Tests/FunctionalTests/TestCore/TestCore.py b/Tests/FunctionalTests/TestCore/TestCore.py
index c8a5406cb42f6652db5ba590bedf7561d83594ed..30439d8a6adb0dc945a443dd08847984f5feb1b6 100755
--- a/Tests/FunctionalTests/TestCore/TestCore.py
+++ b/Tests/FunctionalTests/TestCore/TestCore.py
@@ -17,7 +17,8 @@ Tests = [
   "IsGISAXS09",
   "IsGISAXS10",
   "IsGISAXS11",
-  "IsGISAXS15"
+  "IsGISAXS15",
+  "MesoCrystal1",
 ]
 
 test_info = []
@@ -73,7 +74,7 @@ def getSummary():
   summary += "--------------------------------------------------------------------------------\n"
   n=1
   for x in test_info:
-    summary += '{0:2d}. {1} {2:.53s}  {3:.2f}s [{4}] '.format(n, x[0],x[1],x[2],x[3]) + "\n"
+    summary += '{0:2d}. {1:<12} {2:.53s}  {3:.2f}s [{4}] '.format(n, x[0],x[1],x[2],x[3]) + "\n"
     n+=1
   return summary
 
diff --git a/Tests/FunctionalTests/TestFit/TestFit02/Makefile b/Tests/FunctionalTests/TestFit/TestFit02/Makefile
index 803c3e094c763096486f7c938ee566f763c25d63..0ae1a84a63d9f6e94cbf3bbd08fc7f43fe2f58e3 100644
--- a/Tests/FunctionalTests/TestFit/TestFit02/Makefile
+++ b/Tests/FunctionalTests/TestFit/TestFit02/Makefile
@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: TestFit02
-# Generated by qmake (3.0) (Qt 5.0.1) on: Thu Mar 28 17:11:01 2013
+# Generated by qmake (3.0) (Qt 5.0.1) on: Fri Mar 29 16:06:00 2013
 # Project:  TestFit02.pro
 # Template: app
 # Command: /Users/pospelov/nest/software/Qt5.0.1/5.0.1/clang_64/bin/qmake -spec macx-clang CONFIG+=debug CONFIG+=x86_64 -o Makefile TestFit02.pro
@@ -353,6 +353,7 @@ compiler_clean:
 		../../../../Core/Algorithms/inc/Mask.h \
 		../../../../Core/Algorithms/inc/MaskCoordinateFunction.h \
 		../../../../Core/Tools/inc/SafePointerVector.h \
+		SampleBuilder.h \
 		../../../../Core/Samples/inc/MaterialManager.h \
 		../../../../Core/Tools/inc/ISingleton.h \
 		/opt/local/include/boost/thread.hpp \
@@ -1207,12 +1208,10 @@ compiler_clean:
 		../../../../Core/Samples/inc/HomogeneousMaterial.h \
 		../../../../Core/Samples/inc/IMaterial.h \
 		../../../../Core/Tools/inc/MessageService.h \
-		../../../../Core/Samples/inc/MultiLayer.h \
-		../../../../Core/Samples/inc/ICompositeSample.h \
-		../../../../Core/Samples/inc/Layer.h \
-		../../../../Core/Algorithms/inc/LayerDWBASimulation.h \
-		../../../../Core/Algorithms/inc/DWBASimulation.h \
-		../../../../Core/Algorithms/inc/ISimulation.h \
+		../../../../Core/Fitting/inc/FitSuite.h \
+		../../../../Core/Fitting/inc/AttFitting.h \
+		../../../../Core/Fitting/inc/FitSuiteFunctions.h \
+		../../../../Core/Fitting/inc/FitSuiteObjects.h \
 		../../../../Core/Algorithms/inc/Simulation.h \
 		../../../../Core/Algorithms/inc/Instrument.h \
 		../../../../Core/Algorithms/inc/Beam.h \
@@ -1222,53 +1221,6 @@ compiler_clean:
 		../../../../Core/Tools/inc/TRange.h \
 		../../../../Core/Algorithms/inc/IResolutionFunction2D.h \
 		../../../../Core/Algorithms/inc/SimulationParameters.h \
-		../../../../Core/Algorithms/inc/ThreadInfo.h \
-		../../../../Core/Tools/inc/IDoubleToComplexFunction.h \
-		../../../../Core/Samples/inc/LayerInterface.h \
-		../../../../Core/Samples/inc/LayerRoughness.h \
-		../../../../Core/Samples/inc/IRoughness.h \
-		../../../../Core/Algorithms/inc/MultiLayerDWBASimulation.h \
-		../../../../Core/Samples/inc/LayerDecorator.h \
-		../../../../Core/Samples/inc/ParticleDecoration.h \
-		../../../../Core/Samples/inc/IDecoration.h \
-		../../../../Core/FormFactors/inc/IFormFactor.h \
-		../../../../Core/Tools/inc/MemberFunctionIntegrator.h \
-		/opt/local/include/gsl/gsl_integration.h \
-		/opt/local/include/gsl/gsl_math.h \
-		/opt/local/include/gsl/gsl_sys.h \
-		/opt/local/include/gsl/gsl_inline.h \
-		/opt/local/include/gsl/gsl_machine.h \
-		/opt/local/include/gsl/gsl_precision.h \
-		/opt/local/include/gsl/gsl_types.h \
-		/opt/local/include/gsl/gsl_nan.h \
-		/opt/local/include/gsl/gsl_pow_int.h \
-		/opt/local/include/gsl/gsl_minmax.h \
-		../../../../Core/Samples/inc/ParticleInfo.h \
-		../../../../Core/Samples/inc/Particle.h \
-		../../../../Core/FormFactors/inc/FormFactorDecoratorRefractiveIndex.h \
-		../../../../Core/FormFactors/inc/FormFactorDecoratorFactor.h \
-		../../../../Core/FormFactors/inc/IFormFactorDecorator.h \
-		../../../../Core/Geometry/inc/Transform3D.h \
-		../../../../Core/Samples/inc/IInterferenceFunction.h \
-		../../../../Core/Algorithms/inc/LayerDecoratorDWBASimulation.h \
-		../../../../Core/Algorithms/inc/DiffuseDWBASimulation.h \
-		../../../../Core/Samples/inc/DiffuseParticleInfo.h \
-		../../../../Core/Algorithms/inc/IInterferenceFunctionStrategy.h \
-		../../../../Core/Algorithms/inc/StrategyBuilder.h \
-		../../../../Core/Samples/inc/InterferenceFunctions.h \
-		../../../../Core/Samples/inc/InterferenceFunctionNone.h \
-		../../../../Core/Samples/inc/InterferenceFunction1DParaCrystal.h \
-		../../../../Core/Samples/inc/InterferenceFunction2DLattice.h \
-		../../../../Core/Samples/inc/Lattice2DIFParameters.h \
-		../../../../Core/Algorithms/inc/FTDistributions.h \
-		../../../../Core/Samples/inc/InterferenceFunction2DParaCrystal.h \
-		../../../../Core/FormFactors/inc/FormFactorCylinder.h \
-		../../../../Core/FormFactors/inc/IFormFactorBorn.h \
-		../../../../Core/Tools/inc/Units.h \
-		../../../../Core/Fitting/inc/FitSuite.h \
-		../../../../Core/Fitting/inc/AttFitting.h \
-		../../../../Core/Fitting/inc/FitSuiteFunctions.h \
-		../../../../Core/Fitting/inc/FitSuiteObjects.h \
 		../../../../Core/Fitting/inc/FitObject.h \
 		../../../../Core/Algorithms/inc/ChiSquaredModule.h \
 		../../../../Core/Algorithms/inc/IChiSquaredModule.h \
@@ -1285,14 +1237,23 @@ compiler_clean:
 		../../../../Core/Fitting/inc/IMinimizer.h \
 		../../../../Core/Tools/inc/IObserver.h \
 		../../../../Fit/Factory/inc/MinimizerFactory.h \
-		../../../../Core/FormFactors/inc/FormFactorPrism3.h \
-		../../../../Core/Tools/inc/IStochasticParameter.h \
 		../../../../Core/Tools/inc/MathFunctions.h \
+		../../../../Core/Tools/inc/Units.h \
 		/opt/local/include/gsl/gsl_sf_bessel.h \
 		/opt/local/include/gsl/gsl_mode.h \
+		/opt/local/include/gsl/gsl_inline.h \
+		/opt/local/include/gsl/gsl_precision.h \
+		/opt/local/include/gsl/gsl_types.h \
 		/opt/local/include/gsl/gsl_sf_result.h \
 		/opt/local/include/gsl/gsl_sf_trig.h \
 		/opt/local/include/gsl/gsl_sf_expint.h \
+		/opt/local/include/gsl/gsl_integration.h \
+		/opt/local/include/gsl/gsl_math.h \
+		/opt/local/include/gsl/gsl_sys.h \
+		/opt/local/include/gsl/gsl_machine.h \
+		/opt/local/include/gsl/gsl_nan.h \
+		/opt/local/include/gsl/gsl_pow_int.h \
+		/opt/local/include/gsl/gsl_minmax.h \
 		../../../../Core/Tools/inc/Utils.h \
 		/opt/local/include/boost/unordered_map.hpp \
 		/opt/local/include/boost/unordered/unordered_map.hpp \
@@ -1422,7 +1383,1037 @@ compiler_clean:
 		../../../../Core/Tools/inc/ParameterPool.h \
 		../../../../Core/Tools/inc/ICloneable.h \
 		../../../../Core/Tools/inc/Exceptions.h \
-		../../../../Core/Tools/inc/RealParameterWrapper.h
+		../../../../Core/Tools/inc/RealParameterWrapper.h \
+		../../../../Core/Samples/inc/MultiLayer.h \
+		../../../../Core/Samples/inc/Layer.h \
+		../../../../Core/Samples/inc/ICompositeSample.h \
+		../../../../Core/Samples/inc/IMaterial.h \
+		../../../../Core/Samples/inc/HomogeneousMaterial.h \
+		../../../../Core/Tools/inc/Types.h \
+		../../../../Core/Geometry/inc/BasicVector3D.h \
+		../../../../Core/Algorithms/inc/LayerDWBASimulation.h \
+		../../../../Core/Algorithms/inc/DWBASimulation.h \
+		../../../../Core/Algorithms/inc/ISimulation.h \
+		../../../../Core/Algorithms/inc/Simulation.h \
+		../../../../Core/Algorithms/inc/Instrument.h \
+		../../../../Core/Algorithms/inc/Beam.h \
+		../../../../Core/Algorithms/inc/Detector.h \
+		../../../../Core/Algorithms/inc/IDetectorResolution.h \
+		../../../../Core/Tools/inc/OutputData.h \
+		../../../../Core/Tools/inc/AxisDouble.h \
+		../../../../Core/Tools/inc/IAxis.h \
+		../../../../Core/Tools/inc/Bin.h \
+		../../../../Core/Tools/inc/Numeric.h \
+		../../../../Core/Tools/inc/LLData.h \
+		../../../../Core/Tools/inc/OutputDataIterator.h \
+		../../../../Core/Algorithms/inc/Mask.h \
+		../../../../Core/Algorithms/inc/MaskCoordinateFunction.h \
+		../../../../Core/Tools/inc/SafePointerVector.h \
+		../../../../Core/Algorithms/inc/DetectorParameters.h \
+		../../../../Core/Tools/inc/TRange.h \
+		../../../../Core/Algorithms/inc/IResolutionFunction2D.h \
+		../../../../Core/Algorithms/inc/SimulationParameters.h \
+		../../../../Core/Algorithms/inc/ThreadInfo.h \
+		../../../../Core/Tools/inc/IDoubleToComplexFunction.h \
+		../../../../Core/Samples/inc/LayerInterface.h \
+		../../../../Core/Samples/inc/LayerRoughness.h \
+		../../../../Core/Samples/inc/IRoughness.h \
+		../../../../Core/Algorithms/inc/MultiLayerDWBASimulation.h \
+		../../../../Core/Samples/inc/LayerDecorator.h \
+		../../../../Core/Samples/inc/ParticleDecoration.h \
+		../../../../Core/Samples/inc/IDecoration.h \
+		../../../../Core/FormFactors/inc/IFormFactor.h \
+		../../../../Core/Samples/inc/ParticleInfo.h \
+		../../../../Core/Samples/inc/Particle.h \
+		../../../../Core/FormFactors/inc/FormFactorDecoratorRefractiveIndex.h \
+		../../../../Core/FormFactors/inc/FormFactorDecoratorFactor.h \
+		../../../../Core/FormFactors/inc/IFormFactorDecorator.h \
+		../../../../Core/Geometry/inc/Transform3D.h \
+		../../../../Core/Samples/inc/IInterferenceFunction.h \
+		../../../../Core/Algorithms/inc/LayerDecoratorDWBASimulation.h \
+		../../../../Core/Algorithms/inc/DiffuseDWBASimulation.h \
+		../../../../Core/Samples/inc/DiffuseParticleInfo.h \
+		../../../../Core/Algorithms/inc/IInterferenceFunctionStrategy.h \
+		../../../../Core/Algorithms/inc/StrategyBuilder.h \
+		../../../../Core/Samples/inc/InterferenceFunctions.h \
+		../../../../Core/Samples/inc/InterferenceFunctionNone.h \
+		../../../../Core/Samples/inc/InterferenceFunction1DParaCrystal.h \
+		../../../../Core/Samples/inc/InterferenceFunction2DLattice.h \
+		../../../../Core/Samples/inc/Lattice2DIFParameters.h \
+		../../../../Core/Algorithms/inc/FTDistributions.h \
+		../../../../Core/Samples/inc/InterferenceFunction2DParaCrystal.h \
+		../../../../Core/FormFactors/inc/FormFactorCylinder.h \
+		../../../../Core/FormFactors/inc/IFormFactorBorn.h \
+		../../../../Core/Tools/inc/Units.h \
+		../../../../Core/Samples/inc/MaterialManager.h \
+		../../../../Core/Tools/inc/ISingleton.h \
+		/opt/local/include/boost/thread.hpp \
+		/opt/local/include/boost/thread/thread.hpp \
+		/opt/local/include/boost/thread/detail/platform.hpp \
+		/opt/local/include/boost/config.hpp \
+		/opt/local/include/boost/config/select_compiler_config.hpp \
+		/opt/local/include/boost/config/select_stdlib_config.hpp \
+		/opt/local/include/boost/config/no_tr1/utility.hpp \
+		/opt/local/include/boost/config/select_platform_config.hpp \
+		/opt/local/include/boost/config/posix_features.hpp \
+		/opt/local/include/boost/config/suffix.hpp \
+		/opt/local/include/boost/type.hpp \
+		/opt/local/include/boost/non_type.hpp \
+		/opt/local/include/boost/config/requires_threads.hpp \
+		/opt/local/include/boost/thread/win32/thread_data.hpp \
+		/opt/local/include/boost/thread/detail/config.hpp \
+		/opt/local/include/boost/detail/workaround.hpp \
+		/opt/local/include/boost/config/auto_link.hpp \
+		/opt/local/include/boost/version.hpp \
+		/opt/local/include/boost/thread/thread_time.hpp \
+		/opt/local/include/boost/date_time/time_clock.hpp \
+		/opt/local/include/boost/date_time/c_time.hpp \
+		/opt/local/include/boost/throw_exception.hpp \
+		/opt/local/include/boost/exception/detail/attribute_noreturn.hpp \
+		/opt/local/include/boost/exception/exception.hpp \
+		/opt/local/include/boost/current_function.hpp \
+		/opt/local/include/boost/date_time/compiler_config.hpp \
+		/opt/local/include/boost/date_time/locale_config.hpp \
+		/opt/local/include/boost/cstdint.hpp \
+		/opt/local/include/boost/limits.hpp \
+		/opt/local/include/boost/detail/limits.hpp \
+		/opt/local/include/boost/detail/endian.hpp \
+		/opt/local/include/boost/shared_ptr.hpp \
+		/opt/local/include/boost/smart_ptr/shared_ptr.hpp \
+		/opt/local/include/boost/smart_ptr/detail/shared_ptr_nmt.hpp \
+		/opt/local/include/boost/assert.hpp \
+		/opt/local/include/boost/checked_delete.hpp \
+		/opt/local/include/boost/smart_ptr/detail/atomic_count.hpp \
+		/opt/local/include/boost/smart_ptr/detail/sp_has_sync.hpp \
+		/opt/local/include/boost/smart_ptr/detail/atomic_count_pthreads.hpp \
+		/opt/local/include/boost/smart_ptr/detail/atomic_count_gcc_x86.hpp \
+		/opt/local/include/boost/smart_ptr/detail/atomic_count_win32.hpp \
+		/opt/local/include/boost/detail/interlocked.hpp \
+		/opt/local/include/boost/smart_ptr/detail/atomic_count_sync.hpp \
+		/opt/local/include/boost/smart_ptr/detail/atomic_count_gcc.hpp \
+		/opt/local/include/boost/config/no_tr1/memory.hpp \
+		/opt/local/include/boost/smart_ptr/detail/shared_count.hpp \
+		/opt/local/include/boost/smart_ptr/bad_weak_ptr.hpp \
+		/opt/local/include/boost/smart_ptr/detail/sp_counted_base.hpp \
+		/opt/local/include/boost/smart_ptr/detail/sp_counted_base_nt.hpp \
+		/opt/local/include/boost/detail/sp_typeinfo.hpp \
+		/opt/local/include/boost/smart_ptr/detail/sp_counted_base_spin.hpp \
+		/opt/local/include/boost/smart_ptr/detail/spinlock_pool.hpp \
+		/opt/local/include/boost/smart_ptr/detail/spinlock.hpp \
+		/opt/local/include/boost/smart_ptr/detail/spinlock_pt.hpp \
+		/opt/local/include/boost/smart_ptr/detail/spinlock_gcc_arm.hpp \
+		/opt/local/include/boost/smart_ptr/detail/yield_k.hpp \
+		/opt/local/include/boost/smart_ptr/detail/spinlock_sync.hpp \
+		/opt/local/include/boost/smart_ptr/detail/spinlock_w32.hpp \
+		/opt/local/include/boost/smart_ptr/detail/spinlock_nt.hpp \
+		/opt/local/include/boost/smart_ptr/detail/sp_counted_base_pt.hpp \
+		/opt/local/include/boost/smart_ptr/detail/sp_counted_base_snc_ps3.hpp \
+		/opt/local/include/boost/smart_ptr/detail/sp_counted_base_gcc_x86.hpp \
+		/opt/local/include/boost/smart_ptr/detail/sp_counted_base_acc_ia64.hpp \
+		/opt/local/include/boost/smart_ptr/detail/sp_counted_base_gcc_ia64.hpp \
+		/opt/local/include/boost/smart_ptr/detail/sp_counted_base_vacpp_ppc.hpp \
+		/opt/local/include/boost/smart_ptr/detail/sp_counted_base_cw_ppc.hpp \
+		/opt/local/include/boost/smart_ptr/detail/sp_counted_base_gcc_ppc.hpp \
+		/opt/local/include/boost/smart_ptr/detail/sp_counted_base_gcc_mips.hpp \
+		/opt/local/include/boost/smart_ptr/detail/sp_counted_base_sync.hpp \
+		/opt/local/include/boost/smart_ptr/detail/sp_counted_base_gcc_sparc.hpp \
+		/opt/local/include/boost/smart_ptr/detail/sp_counted_base_w32.hpp \
+		/opt/local/include/boost/smart_ptr/detail/sp_counted_base_aix.hpp \
+		/opt/local/include/boost/smart_ptr/detail/sp_counted_impl.hpp \
+		/opt/local/include/boost/smart_ptr/detail/quick_allocator.hpp \
+		/opt/local/include/boost/smart_ptr/detail/lightweight_mutex.hpp \
+		/opt/local/include/boost/smart_ptr/detail/lwm_nop.hpp \
+		/opt/local/include/boost/smart_ptr/detail/lwm_pthreads.hpp \
+		/opt/local/include/boost/smart_ptr/detail/lwm_win32_cs.hpp \
+		/opt/local/include/boost/type_traits/type_with_alignment.hpp \
+		/opt/local/include/boost/mpl/if.hpp \
+		/opt/local/include/boost/mpl/aux_/value_wknd.hpp \
+		/opt/local/include/boost/mpl/aux_/static_cast.hpp \
+		/opt/local/include/boost/mpl/aux_/config/workaround.hpp \
+		/opt/local/include/boost/mpl/aux_/config/integral.hpp \
+		/opt/local/include/boost/mpl/aux_/config/msvc.hpp \
+		/opt/local/include/boost/mpl/aux_/config/eti.hpp \
+		/opt/local/include/boost/mpl/int.hpp \
+		/opt/local/include/boost/mpl/int_fwd.hpp \
+		/opt/local/include/boost/mpl/aux_/adl_barrier.hpp \
+		/opt/local/include/boost/mpl/aux_/config/adl.hpp \
+		/opt/local/include/boost/mpl/aux_/config/intel.hpp \
+		/opt/local/include/boost/mpl/aux_/config/gcc.hpp \
+		/opt/local/include/boost/mpl/aux_/nttp_decl.hpp \
+		/opt/local/include/boost/mpl/aux_/config/nttp.hpp \
+		/opt/local/include/boost/preprocessor/cat.hpp \
+		/opt/local/include/boost/preprocessor/config/config.hpp \
+		/opt/local/include/boost/mpl/aux_/integral_wrapper.hpp \
+		/opt/local/include/boost/mpl/integral_c_tag.hpp \
+		/opt/local/include/boost/mpl/aux_/config/static_constant.hpp \
+		/opt/local/include/boost/mpl/aux_/na_spec.hpp \
+		/opt/local/include/boost/mpl/lambda_fwd.hpp \
+		/opt/local/include/boost/mpl/void_fwd.hpp \
+		/opt/local/include/boost/mpl/aux_/na.hpp \
+		/opt/local/include/boost/mpl/bool.hpp \
+		/opt/local/include/boost/mpl/bool_fwd.hpp \
+		/opt/local/include/boost/mpl/aux_/na_fwd.hpp \
+		/opt/local/include/boost/mpl/aux_/config/ctps.hpp \
+		/opt/local/include/boost/mpl/aux_/config/lambda.hpp \
+		/opt/local/include/boost/mpl/aux_/config/ttp.hpp \
+		/opt/local/include/boost/mpl/aux_/lambda_arity_param.hpp \
+		/opt/local/include/boost/mpl/aux_/template_arity_fwd.hpp \
+		/opt/local/include/boost/mpl/aux_/arity.hpp \
+		/opt/local/include/boost/mpl/aux_/config/dtp.hpp \
+		/opt/local/include/boost/mpl/aux_/preprocessor/params.hpp \
+		/opt/local/include/boost/mpl/aux_/config/preprocessor.hpp \
+		/opt/local/include/boost/preprocessor/comma_if.hpp \
+		/opt/local/include/boost/preprocessor/punctuation/comma_if.hpp \
+		/opt/local/include/boost/preprocessor/control/if.hpp \
+		/opt/local/include/boost/preprocessor/control/iif.hpp \
+		/opt/local/include/boost/preprocessor/logical/bool.hpp \
+		/opt/local/include/boost/preprocessor/facilities/empty.hpp \
+		/opt/local/include/boost/preprocessor/punctuation/comma.hpp \
+		/opt/local/include/boost/preprocessor/repeat.hpp \
+		/opt/local/include/boost/preprocessor/repetition/repeat.hpp \
+		/opt/local/include/boost/preprocessor/debug/error.hpp \
+		/opt/local/include/boost/preprocessor/detail/auto_rec.hpp \
+		/opt/local/include/boost/preprocessor/detail/dmc/auto_rec.hpp \
+		/opt/local/include/boost/preprocessor/tuple/eat.hpp \
+		/opt/local/include/boost/preprocessor/inc.hpp \
+		/opt/local/include/boost/preprocessor/arithmetic/inc.hpp \
+		/opt/local/include/boost/mpl/aux_/preprocessor/enum.hpp \
+		/opt/local/include/boost/mpl/aux_/preprocessor/def_params_tail.hpp \
+		/opt/local/include/boost/mpl/limits/arity.hpp \
+		/opt/local/include/boost/preprocessor/logical/and.hpp \
+		/opt/local/include/boost/preprocessor/logical/bitand.hpp \
+		/opt/local/include/boost/preprocessor/identity.hpp \
+		/opt/local/include/boost/preprocessor/facilities/identity.hpp \
+		/opt/local/include/boost/preprocessor/empty.hpp \
+		/opt/local/include/boost/mpl/aux_/preprocessor/filter_params.hpp \
+		/opt/local/include/boost/mpl/aux_/preprocessor/sub.hpp \
+		/opt/local/include/boost/mpl/aux_/preprocessor/tuple.hpp \
+		/opt/local/include/boost/preprocessor/arithmetic/sub.hpp \
+		/opt/local/include/boost/preprocessor/arithmetic/dec.hpp \
+		/opt/local/include/boost/preprocessor/control/while.hpp \
+		/opt/local/include/boost/preprocessor/list/fold_left.hpp \
+		/opt/local/include/boost/preprocessor/list/detail/edg/fold_left.hpp \
+		/opt/local/include/boost/preprocessor/control/expr_iif.hpp \
+		/opt/local/include/boost/preprocessor/list/adt.hpp \
+		/opt/local/include/boost/preprocessor/detail/is_binary.hpp \
+		/opt/local/include/boost/preprocessor/detail/check.hpp \
+		/opt/local/include/boost/preprocessor/logical/compl.hpp \
+		/opt/local/include/boost/preprocessor/list/detail/dmc/fold_left.hpp \
+		/opt/local/include/boost/preprocessor/tuple/elem.hpp \
+		/opt/local/include/boost/preprocessor/facilities/overload.hpp \
+		/opt/local/include/boost/preprocessor/variadic/size.hpp \
+		/opt/local/include/boost/preprocessor/tuple/rem.hpp \
+		/opt/local/include/boost/preprocessor/variadic/elem.hpp \
+		/opt/local/include/boost/preprocessor/list/detail/fold_left.hpp \
+		/opt/local/include/boost/preprocessor/list/fold_right.hpp \
+		/opt/local/include/boost/preprocessor/list/detail/edg/fold_right.hpp \
+		/opt/local/include/boost/preprocessor/list/detail/fold_right.hpp \
+		/opt/local/include/boost/preprocessor/list/reverse.hpp \
+		/opt/local/include/boost/preprocessor/control/detail/edg/while.hpp \
+		/opt/local/include/boost/preprocessor/control/detail/msvc/while.hpp \
+		/opt/local/include/boost/preprocessor/control/detail/dmc/while.hpp \
+		/opt/local/include/boost/preprocessor/control/detail/while.hpp \
+		/opt/local/include/boost/preprocessor/arithmetic/add.hpp \
+		/opt/local/include/boost/mpl/aux_/config/overload_resolution.hpp \
+		/opt/local/include/boost/mpl/aux_/lambda_support.hpp \
+		/opt/local/include/boost/mpl/aux_/yes_no.hpp \
+		/opt/local/include/boost/mpl/aux_/config/arrays.hpp \
+		/opt/local/include/boost/preprocessor/tuple/to_list.hpp \
+		/opt/local/include/boost/preprocessor/list/for_each_i.hpp \
+		/opt/local/include/boost/preprocessor/repetition/for.hpp \
+		/opt/local/include/boost/preprocessor/repetition/detail/edg/for.hpp \
+		/opt/local/include/boost/preprocessor/repetition/detail/msvc/for.hpp \
+		/opt/local/include/boost/preprocessor/repetition/detail/dmc/for.hpp \
+		/opt/local/include/boost/preprocessor/repetition/detail/for.hpp \
+		/opt/local/include/boost/preprocessor/list/transform.hpp \
+		/opt/local/include/boost/preprocessor/list/append.hpp \
+		/opt/local/include/boost/type_traits/alignment_of.hpp \
+		/opt/local/include/boost/type_traits/intrinsics.hpp \
+		/opt/local/include/boost/type_traits/config.hpp \
+		/opt/local/include/boost/type_traits/is_same.hpp \
+		/opt/local/include/boost/type_traits/detail/yes_no_type.hpp \
+		/opt/local/include/boost/type_traits/detail/ice_and.hpp \
+		/opt/local/include/boost/type_traits/is_reference.hpp \
+		/opt/local/include/boost/type_traits/is_lvalue_reference.hpp \
+		/opt/local/include/boost/type_traits/detail/wrap.hpp \
+		/opt/local/include/boost/type_traits/detail/bool_trait_def.hpp \
+		/opt/local/include/boost/type_traits/detail/template_arity_spec.hpp \
+		/opt/local/include/boost/type_traits/integral_constant.hpp \
+		/opt/local/include/boost/mpl/integral_c.hpp \
+		/opt/local/include/boost/mpl/integral_c_fwd.hpp \
+		/opt/local/include/boost/type_traits/detail/bool_trait_undef.hpp \
+		/opt/local/include/boost/type_traits/is_rvalue_reference.hpp \
+		/opt/local/include/boost/type_traits/ice.hpp \
+		/opt/local/include/boost/type_traits/detail/ice_or.hpp \
+		/opt/local/include/boost/type_traits/detail/ice_not.hpp \
+		/opt/local/include/boost/type_traits/detail/ice_eq.hpp \
+		/opt/local/include/boost/type_traits/is_function.hpp \
+		/opt/local/include/boost/type_traits/detail/false_result.hpp \
+		/opt/local/include/boost/type_traits/detail/is_function_ptr_helper.hpp \
+		/opt/local/include/boost/preprocessor/iterate.hpp \
+		/opt/local/include/boost/preprocessor/iteration/iterate.hpp \
+		/opt/local/include/boost/preprocessor/array/elem.hpp \
+		/opt/local/include/boost/preprocessor/array/data.hpp \
+		/opt/local/include/boost/preprocessor/array/size.hpp \
+		/opt/local/include/boost/preprocessor/slot/slot.hpp \
+		/opt/local/include/boost/preprocessor/slot/detail/def.hpp \
+		/opt/local/include/boost/preprocessor/enum_params.hpp \
+		/opt/local/include/boost/preprocessor/repetition/enum_params.hpp \
+		/opt/local/include/boost/type_traits/detail/is_function_ptr_tester.hpp \
+		/opt/local/include/boost/type_traits/is_volatile.hpp \
+		/opt/local/include/boost/type_traits/detail/cv_traits_impl.hpp \
+		/opt/local/include/boost/type_traits/remove_bounds.hpp \
+		/opt/local/include/boost/type_traits/msvc/remove_bounds.hpp \
+		/opt/local/include/boost/type_traits/msvc/typeof.hpp \
+		/opt/local/include/boost/type_traits/is_array.hpp \
+		/opt/local/include/boost/type_traits/detail/type_trait_def.hpp \
+		/opt/local/include/boost/type_traits/detail/type_trait_undef.hpp \
+		/opt/local/include/boost/type_traits/is_abstract.hpp \
+		/opt/local/include/boost/static_assert.hpp \
+		/opt/local/include/boost/type_traits/is_class.hpp \
+		/opt/local/include/boost/type_traits/is_union.hpp \
+		/opt/local/include/boost/type_traits/remove_cv.hpp \
+		/opt/local/include/boost/type_traits/broken_compiler_spec.hpp \
+		/opt/local/include/boost/type_traits/msvc/remove_cv.hpp \
+		/opt/local/include/boost/type_traits/is_const.hpp \
+		/opt/local/include/boost/type_traits/is_pointer.hpp \
+		/opt/local/include/boost/type_traits/is_member_pointer.hpp \
+		/opt/local/include/boost/type_traits/is_member_function_pointer.hpp \
+		/opt/local/include/boost/type_traits/detail/is_mem_fun_pointer_impl.hpp \
+		/opt/local/include/boost/type_traits/detail/is_mem_fun_pointer_tester.hpp \
+		/opt/local/include/boost/type_traits/is_scalar.hpp \
+		/opt/local/include/boost/type_traits/is_arithmetic.hpp \
+		/opt/local/include/boost/type_traits/is_integral.hpp \
+		/opt/local/include/boost/type_traits/is_float.hpp \
+		/opt/local/include/boost/type_traits/is_enum.hpp \
+		/opt/local/include/boost/type_traits/add_reference.hpp \
+		/opt/local/include/boost/type_traits/is_convertible.hpp \
+		/opt/local/include/boost/type_traits/is_void.hpp \
+		/opt/local/include/boost/type_traits/add_lvalue_reference.hpp \
+		/opt/local/include/boost/type_traits/add_rvalue_reference.hpp \
+		/opt/local/include/boost/type_traits/remove_reference.hpp \
+		/opt/local/include/boost/type_traits/msvc/remove_reference.hpp \
+		/opt/local/include/boost/type_traits/is_polymorphic.hpp \
+		/opt/local/include/boost/type_traits/detail/size_t_trait_def.hpp \
+		/opt/local/include/boost/mpl/size_t.hpp \
+		/opt/local/include/boost/mpl/size_t_fwd.hpp \
+		/opt/local/include/boost/type_traits/detail/size_t_trait_undef.hpp \
+		/opt/local/include/boost/type_traits/is_pod.hpp \
+		/opt/local/include/boost/utility/addressof.hpp \
+		/opt/local/include/boost/smart_ptr/detail/sp_convertible.hpp \
+		/opt/local/include/boost/smart_ptr/detail/sp_nullptr_t.hpp \
+		/opt/local/include/boost/memory_order.hpp \
+		/opt/local/include/boost/smart_ptr/detail/operator_bool.hpp \
+		/opt/local/include/boost/date_time/microsec_time_clock.hpp \
+		/opt/local/include/boost/date_time/filetime_functions.hpp \
+		/opt/local/include/boost/date_time/time.hpp \
+		/opt/local/include/boost/operators.hpp \
+		/opt/local/include/boost/iterator.hpp \
+		/opt/local/include/boost/date_time/time_defs.hpp \
+		/opt/local/include/boost/date_time/special_defs.hpp \
+		/opt/local/include/boost/date_time/date_defs.hpp \
+		/opt/local/include/boost/date_time/posix_time/posix_time_types.hpp \
+		/opt/local/include/boost/date_time/posix_time/ptime.hpp \
+		/opt/local/include/boost/date_time/posix_time/posix_time_system.hpp \
+		/opt/local/include/boost/date_time/posix_time/posix_time_config.hpp \
+		/opt/local/include/boost/config/no_tr1/cmath.hpp \
+		/opt/local/include/boost/date_time/time_duration.hpp \
+		/opt/local/include/boost/date_time/time_resolution_traits.hpp \
+		/opt/local/include/boost/date_time/int_adapter.hpp \
+		/opt/local/include/boost/date_time/gregorian/gregorian_types.hpp \
+		/opt/local/include/boost/date_time/date.hpp \
+		/opt/local/include/boost/date_time/year_month_day.hpp \
+		/opt/local/include/boost/date_time/period.hpp \
+		/opt/local/include/boost/date_time/gregorian/greg_calendar.hpp \
+		/opt/local/include/boost/date_time/gregorian/greg_weekday.hpp \
+		/opt/local/include/boost/date_time/constrained_value.hpp \
+		/opt/local/include/boost/type_traits/is_base_of.hpp \
+		/opt/local/include/boost/type_traits/is_base_and_derived.hpp \
+		/opt/local/include/boost/date_time/gregorian/greg_day_of_year.hpp \
+		/opt/local/include/boost/date_time/gregorian_calendar.hpp \
+		/opt/local/include/boost/date_time/gregorian_calendar.ipp \
+		/opt/local/include/boost/date_time/gregorian/greg_ymd.hpp \
+		/opt/local/include/boost/date_time/gregorian/greg_day.hpp \
+		/opt/local/include/boost/date_time/gregorian/greg_year.hpp \
+		/opt/local/include/boost/date_time/gregorian/greg_month.hpp \
+		/opt/local/include/boost/date_time/gregorian/greg_duration.hpp \
+		/opt/local/include/boost/date_time/date_duration.hpp \
+		/opt/local/include/boost/date_time/date_duration_types.hpp \
+		/opt/local/include/boost/date_time/gregorian/greg_duration_types.hpp \
+		/opt/local/include/boost/date_time/gregorian/greg_date.hpp \
+		/opt/local/include/boost/date_time/adjust_functors.hpp \
+		/opt/local/include/boost/date_time/wrapping_int.hpp \
+		/opt/local/include/boost/date_time/date_generators.hpp \
+		/opt/local/include/boost/date_time/date_clock_device.hpp \
+		/opt/local/include/boost/date_time/date_iterator.hpp \
+		/opt/local/include/boost/date_time/time_system_split.hpp \
+		/opt/local/include/boost/date_time/time_system_counted.hpp \
+		/opt/local/include/boost/date_time/posix_time/date_duration_operators.hpp \
+		/opt/local/include/boost/date_time/posix_time/posix_time_duration.hpp \
+		/opt/local/include/boost/date_time/posix_time/time_period.hpp \
+		/opt/local/include/boost/date_time/time_iterator.hpp \
+		/opt/local/include/boost/date_time/dst_rules.hpp \
+		/opt/local/include/boost/config/abi_prefix.hpp \
+		/opt/local/include/boost/config/abi_suffix.hpp \
+		/opt/local/include/boost/thread/win32/thread_primitives.hpp \
+		/opt/local/include/boost/thread/exceptions.hpp \
+		/opt/local/include/boost/system/system_error.hpp \
+		/opt/local/include/boost/system/error_code.hpp \
+		/opt/local/include/boost/system/config.hpp \
+		/opt/local/include/boost/system/api_config.hpp \
+		/opt/local/include/boost/noncopyable.hpp \
+		/opt/local/include/boost/utility/enable_if.hpp \
+		/opt/local/include/boost/cerrno.hpp \
+		/opt/local/include/boost/thread/win32/thread_heap_alloc.hpp \
+		/opt/local/include/boost/detail/no_exceptions_support.hpp \
+		/opt/local/include/boost/intrusive_ptr.hpp \
+		/opt/local/include/boost/smart_ptr/intrusive_ptr.hpp \
+		/opt/local/include/boost/config/no_tr1/functional.hpp \
+		/opt/local/include/boost/chrono/system_clocks.hpp \
+		/opt/local/include/boost/chrono/config.hpp \
+		/opt/local/include/boost/chrono/duration.hpp \
+		/opt/local/include/boost/chrono/detail/static_assert.hpp \
+		/opt/local/include/boost/mpl/assert.hpp \
+		/opt/local/include/boost/mpl/not.hpp \
+		/opt/local/include/boost/mpl/aux_/nested_type_wknd.hpp \
+		/opt/local/include/boost/mpl/aux_/config/pp_counter.hpp \
+		/opt/local/include/boost/mpl/logical.hpp \
+		/opt/local/include/boost/mpl/or.hpp \
+		/opt/local/include/boost/mpl/aux_/config/use_preprocessed.hpp \
+		/opt/local/include/boost/mpl/aux_/include_preprocessed.hpp \
+		/opt/local/include/boost/mpl/aux_/config/compiler.hpp \
+		/opt/local/include/boost/preprocessor/stringize.hpp \
+		/opt/local/include/boost/mpl/aux_/logical_op.hpp \
+		/opt/local/include/boost/mpl/aux_/preprocessor/ext_params.hpp \
+		/opt/local/include/boost/preprocessor/dec.hpp \
+		/opt/local/include/boost/mpl/and.hpp \
+		/opt/local/include/boost/ratio/ratio.hpp \
+		/opt/local/include/boost/ratio/config.hpp \
+		/opt/local/include/boost/ratio/detail/mpl/abs.hpp \
+		/opt/local/include/boost/ratio/detail/mpl/sign.hpp \
+		/opt/local/include/boost/ratio/detail/mpl/gcd.hpp \
+		/opt/local/include/boost/mpl/aux_/largest_int.hpp \
+		/opt/local/include/boost/mpl/aux_/config/dependent_nttp.hpp \
+		/opt/local/include/boost/ratio/detail/mpl/lcm.hpp \
+		/opt/local/include/boost/integer_traits.hpp \
+		/opt/local/include/boost/ratio/ratio_fwd.hpp \
+		/opt/local/include/boost/ratio/detail/overflow_helpers.hpp \
+		/opt/local/include/boost/rational.hpp \
+		/opt/local/include/boost/call_traits.hpp \
+		/opt/local/include/boost/detail/ob_call_traits.hpp \
+		/opt/local/include/boost/type_traits/arithmetic_traits.hpp \
+		/opt/local/include/boost/type_traits/is_fundamental.hpp \
+		/opt/local/include/boost/type_traits/composite_traits.hpp \
+		/opt/local/include/boost/detail/call_traits.hpp \
+		/opt/local/include/boost/math/common_factor_rt.hpp \
+		/opt/local/include/boost/math_fwd.hpp \
+		/opt/local/include/boost/ratio/mpl/rational_c_tag.hpp \
+		/opt/local/include/boost/type_traits/common_type.hpp \
+		/opt/local/include/boost/typeof/typeof.hpp \
+		/opt/local/include/boost/typeof/dmc/typeof_impl.hpp \
+		/opt/local/include/boost/typeof/msvc/typeof_impl.hpp \
+		/opt/local/include/boost/typeof/unsupported.hpp \
+		/opt/local/include/boost/typeof/typeof_impl.hpp \
+		/opt/local/include/boost/preprocessor/repetition/enum.hpp \
+		/opt/local/include/boost/typeof/encode_decode.hpp \
+		/opt/local/include/boost/mpl/deref.hpp \
+		/opt/local/include/boost/mpl/aux_/msvc_type.hpp \
+		/opt/local/include/boost/mpl/aux_/is_msvc_eti_arg.hpp \
+		/opt/local/include/boost/mpl/next.hpp \
+		/opt/local/include/boost/mpl/next_prior.hpp \
+		/opt/local/include/boost/mpl/aux_/common_name_wknd.hpp \
+		/opt/local/include/boost/typeof/vector.hpp \
+		/opt/local/include/boost/preprocessor/iteration/self.hpp \
+		/opt/local/include/boost/typeof/vector50.hpp \
+		/opt/local/include/boost/typeof/vector100.hpp \
+		/opt/local/include/boost/typeof/vector150.hpp \
+		/opt/local/include/boost/typeof/vector200.hpp \
+		/opt/local/include/boost/preprocessor/repeat_from_to.hpp \
+		/opt/local/include/boost/preprocessor/repetition/repeat_from_to.hpp \
+		/opt/local/include/boost/preprocessor/iteration/local.hpp \
+		/opt/local/include/boost/preprocessor/logical/not.hpp \
+		/opt/local/include/boost/typeof/type_encoding.hpp \
+		/opt/local/include/boost/typeof/template_encoding.hpp \
+		/opt/local/include/boost/preprocessor/repetition/enum_trailing.hpp \
+		/opt/local/include/boost/preprocessor/detail/is_unary.hpp \
+		/opt/local/include/boost/preprocessor/seq/transform.hpp \
+		/opt/local/include/boost/preprocessor/seq/fold_left.hpp \
+		/opt/local/include/boost/preprocessor/seq/seq.hpp \
+		/opt/local/include/boost/preprocessor/seq/elem.hpp \
+		/opt/local/include/boost/preprocessor/seq/size.hpp \
+		/opt/local/include/boost/preprocessor/seq/for_each_i.hpp \
+		/opt/local/include/boost/preprocessor/seq/cat.hpp \
+		/opt/local/include/boost/typeof/int_encoding.hpp \
+		/opt/local/include/boost/typeof/type_template_param.hpp \
+		/opt/local/include/boost/typeof/integral_template_param.hpp \
+		/opt/local/include/boost/typeof/template_template_param.hpp \
+		/opt/local/include/boost/preprocessor/logical/or.hpp \
+		/opt/local/include/boost/preprocessor/logical/bitor.hpp \
+		/opt/local/include/boost/preprocessor/seq/enum.hpp \
+		/opt/local/include/boost/typeof/modifiers.hpp \
+		/opt/local/include/boost/typeof/pointers_data_members.hpp \
+		/opt/local/include/boost/typeof/encode_decode_params.hpp \
+		/opt/local/include/boost/typeof/register_functions.hpp \
+		/opt/local/include/boost/preprocessor/repetition/enum_trailing_params.hpp \
+		/opt/local/include/boost/preprocessor/if.hpp \
+		/opt/local/include/boost/typeof/register_fundamental.hpp \
+		/opt/local/include/boost/typeof/native.hpp \
+		/opt/local/include/boost/type_traits/detail/common_type_imp.hpp \
+		/opt/local/include/boost/mpl/at.hpp \
+		/opt/local/include/boost/mpl/at_fwd.hpp \
+		/opt/local/include/boost/mpl/aux_/at_impl.hpp \
+		/opt/local/include/boost/mpl/begin_end.hpp \
+		/opt/local/include/boost/mpl/begin_end_fwd.hpp \
+		/opt/local/include/boost/mpl/aux_/begin_end_impl.hpp \
+		/opt/local/include/boost/mpl/sequence_tag_fwd.hpp \
+		/opt/local/include/boost/mpl/void.hpp \
+		/opt/local/include/boost/mpl/eval_if.hpp \
+		/opt/local/include/boost/mpl/aux_/has_begin.hpp \
+		/opt/local/include/boost/mpl/has_xxx.hpp \
+		/opt/local/include/boost/mpl/aux_/type_wrapper.hpp \
+		/opt/local/include/boost/mpl/aux_/config/has_xxx.hpp \
+		/opt/local/include/boost/mpl/aux_/config/msvc_typename.hpp \
+		/opt/local/include/boost/mpl/aux_/traits_lambda_spec.hpp \
+		/opt/local/include/boost/mpl/sequence_tag.hpp \
+		/opt/local/include/boost/mpl/aux_/has_tag.hpp \
+		/opt/local/include/boost/mpl/advance.hpp \
+		/opt/local/include/boost/mpl/advance_fwd.hpp \
+		/opt/local/include/boost/mpl/less.hpp \
+		/opt/local/include/boost/mpl/aux_/comparison_op.hpp \
+		/opt/local/include/boost/mpl/aux_/numeric_op.hpp \
+		/opt/local/include/boost/mpl/numeric_cast.hpp \
+		/opt/local/include/boost/mpl/apply_wrap.hpp \
+		/opt/local/include/boost/mpl/aux_/has_apply.hpp \
+		/opt/local/include/boost/mpl/aux_/config/has_apply.hpp \
+		/opt/local/include/boost/mpl/aux_/msvc_never_true.hpp \
+		/opt/local/include/boost/mpl/aux_/preprocessor/add.hpp \
+		/opt/local/include/boost/mpl/aux_/config/bcc.hpp \
+		/opt/local/include/boost/mpl/aux_/msvc_dtw.hpp \
+		/opt/local/include/boost/mpl/tag.hpp \
+		/opt/local/include/boost/mpl/aux_/numeric_cast_utils.hpp \
+		/opt/local/include/boost/mpl/aux_/config/forwarding.hpp \
+		/opt/local/include/boost/mpl/aux_/msvc_eti_base.hpp \
+		/opt/local/include/boost/mpl/aux_/preprocessor/partial_spec_params.hpp \
+		/opt/local/include/boost/mpl/aux_/preprocessor/repeat.hpp \
+		/opt/local/include/boost/mpl/negate.hpp \
+		/opt/local/include/boost/mpl/long.hpp \
+		/opt/local/include/boost/mpl/long_fwd.hpp \
+		/opt/local/include/boost/mpl/aux_/advance_forward.hpp \
+		/opt/local/include/boost/mpl/limits/unrolling.hpp \
+		/opt/local/include/boost/mpl/aux_/advance_backward.hpp \
+		/opt/local/include/boost/mpl/prior.hpp \
+		/opt/local/include/boost/mpl/contains.hpp \
+		/opt/local/include/boost/mpl/contains_fwd.hpp \
+		/opt/local/include/boost/mpl/aux_/contains_impl.hpp \
+		/opt/local/include/boost/mpl/find.hpp \
+		/opt/local/include/boost/mpl/find_if.hpp \
+		/opt/local/include/boost/mpl/aux_/find_if_pred.hpp \
+		/opt/local/include/boost/mpl/aux_/iter_apply.hpp \
+		/opt/local/include/boost/mpl/apply.hpp \
+		/opt/local/include/boost/mpl/apply_fwd.hpp \
+		/opt/local/include/boost/mpl/aux_/preprocessor/default_params.hpp \
+		/opt/local/include/boost/mpl/placeholders.hpp \
+		/opt/local/include/boost/mpl/arg.hpp \
+		/opt/local/include/boost/mpl/arg_fwd.hpp \
+		/opt/local/include/boost/mpl/aux_/na_assert.hpp \
+		/opt/local/include/boost/mpl/aux_/arity_spec.hpp \
+		/opt/local/include/boost/mpl/aux_/arg_typedef.hpp \
+		/opt/local/include/boost/mpl/lambda.hpp \
+		/opt/local/include/boost/mpl/bind.hpp \
+		/opt/local/include/boost/mpl/bind_fwd.hpp \
+		/opt/local/include/boost/mpl/aux_/config/bind.hpp \
+		/opt/local/include/boost/mpl/aux_/config/dmc_ambiguous_ctps.hpp \
+		/opt/local/include/boost/mpl/protect.hpp \
+		/opt/local/include/boost/mpl/aux_/count_args.hpp \
+		/opt/local/include/boost/preprocessor/expr_if.hpp \
+		/opt/local/include/boost/preprocessor/control/expr_if.hpp \
+		/opt/local/include/boost/preprocessor/enum_shifted_params.hpp \
+		/opt/local/include/boost/preprocessor/repetition/enum_shifted_params.hpp \
+		/opt/local/include/boost/mpl/aux_/full_lambda.hpp \
+		/opt/local/include/boost/mpl/quote.hpp \
+		/opt/local/include/boost/mpl/aux_/has_type.hpp \
+		/opt/local/include/boost/mpl/aux_/template_arity.hpp \
+		/opt/local/include/boost/mpl/aux_/has_rebind.hpp \
+		/opt/local/include/boost/mpl/aux_/msvc_is_class.hpp \
+		/opt/local/include/boost/mpl/aux_/preprocessor/range.hpp \
+		/opt/local/include/boost/preprocessor/seq/subseq.hpp \
+		/opt/local/include/boost/preprocessor/seq/first_n.hpp \
+		/opt/local/include/boost/preprocessor/seq/detail/split.hpp \
+		/opt/local/include/boost/preprocessor/seq/rest_n.hpp \
+		/opt/local/include/boost/mpl/aux_/lambda_no_ctps.hpp \
+		/opt/local/include/boost/mpl/is_placeholder.hpp \
+		/opt/local/include/boost/mpl/identity.hpp \
+		/opt/local/include/boost/mpl/iter_fold_if.hpp \
+		/opt/local/include/boost/mpl/always.hpp \
+		/opt/local/include/boost/mpl/pair.hpp \
+		/opt/local/include/boost/mpl/aux_/iter_fold_if_impl.hpp \
+		/opt/local/include/boost/mpl/same_as.hpp \
+		/opt/local/include/boost/mpl/aux_/lambda_spec.hpp \
+		/opt/local/include/boost/mpl/copy.hpp \
+		/opt/local/include/boost/mpl/fold.hpp \
+		/opt/local/include/boost/mpl/O1_size.hpp \
+		/opt/local/include/boost/mpl/O1_size_fwd.hpp \
+		/opt/local/include/boost/mpl/aux_/O1_size_impl.hpp \
+		/opt/local/include/boost/mpl/aux_/has_size.hpp \
+		/opt/local/include/boost/mpl/aux_/fold_impl.hpp \
+		/opt/local/include/boost/mpl/aux_/fold_impl_body.hpp \
+		/opt/local/include/boost/mpl/reverse_fold.hpp \
+		/opt/local/include/boost/mpl/aux_/reverse_fold_impl.hpp \
+		/opt/local/include/boost/mpl/aux_/reverse_fold_impl_body.hpp \
+		/opt/local/include/boost/mpl/aux_/inserter_algorithm.hpp \
+		/opt/local/include/boost/mpl/back_inserter.hpp \
+		/opt/local/include/boost/mpl/push_back.hpp \
+		/opt/local/include/boost/mpl/push_back_fwd.hpp \
+		/opt/local/include/boost/mpl/aux_/push_back_impl.hpp \
+		/opt/local/include/boost/mpl/inserter.hpp \
+		/opt/local/include/boost/mpl/front_inserter.hpp \
+		/opt/local/include/boost/mpl/push_front.hpp \
+		/opt/local/include/boost/mpl/push_front_fwd.hpp \
+		/opt/local/include/boost/mpl/aux_/push_front_impl.hpp \
+		/opt/local/include/boost/mpl/clear.hpp \
+		/opt/local/include/boost/mpl/clear_fwd.hpp \
+		/opt/local/include/boost/mpl/aux_/clear_impl.hpp \
+		/opt/local/include/boost/mpl/size.hpp \
+		/opt/local/include/boost/mpl/size_fwd.hpp \
+		/opt/local/include/boost/mpl/aux_/size_impl.hpp \
+		/opt/local/include/boost/mpl/distance.hpp \
+		/opt/local/include/boost/mpl/distance_fwd.hpp \
+		/opt/local/include/boost/mpl/iter_fold.hpp \
+		/opt/local/include/boost/mpl/aux_/iter_fold_impl.hpp \
+		/opt/local/include/boost/mpl/iterator_range.hpp \
+		/opt/local/include/boost/mpl/vector/vector0.hpp \
+		/opt/local/include/boost/mpl/vector/aux_/at.hpp \
+		/opt/local/include/boost/mpl/vector/aux_/tag.hpp \
+		/opt/local/include/boost/mpl/aux_/config/typeof.hpp \
+		/opt/local/include/boost/mpl/vector/aux_/front.hpp \
+		/opt/local/include/boost/mpl/front_fwd.hpp \
+		/opt/local/include/boost/mpl/vector/aux_/push_front.hpp \
+		/opt/local/include/boost/mpl/vector/aux_/item.hpp \
+		/opt/local/include/boost/mpl/vector/aux_/pop_front.hpp \
+		/opt/local/include/boost/mpl/pop_front_fwd.hpp \
+		/opt/local/include/boost/mpl/vector/aux_/push_back.hpp \
+		/opt/local/include/boost/mpl/vector/aux_/pop_back.hpp \
+		/opt/local/include/boost/mpl/pop_back_fwd.hpp \
+		/opt/local/include/boost/mpl/vector/aux_/back.hpp \
+		/opt/local/include/boost/mpl/back_fwd.hpp \
+		/opt/local/include/boost/mpl/vector/aux_/clear.hpp \
+		/opt/local/include/boost/mpl/vector/aux_/vector0.hpp \
+		/opt/local/include/boost/mpl/vector/aux_/iterator.hpp \
+		/opt/local/include/boost/mpl/iterator_tags.hpp \
+		/opt/local/include/boost/mpl/plus.hpp \
+		/opt/local/include/boost/mpl/aux_/arithmetic_op.hpp \
+		/opt/local/include/boost/mpl/minus.hpp \
+		/opt/local/include/boost/mpl/vector/aux_/O1_size.hpp \
+		/opt/local/include/boost/mpl/vector/aux_/size.hpp \
+		/opt/local/include/boost/mpl/vector/aux_/empty.hpp \
+		/opt/local/include/boost/mpl/empty_fwd.hpp \
+		/opt/local/include/boost/mpl/vector/aux_/begin_end.hpp \
+		/opt/local/include/boost/mpl/vector/vector10.hpp \
+		/opt/local/include/boost/mpl/vector/aux_/include_preprocessed.hpp \
+		/opt/local/include/boost/type_traits/make_signed.hpp \
+		/opt/local/include/boost/type_traits/is_signed.hpp \
+		/opt/local/include/boost/type_traits/is_unsigned.hpp \
+		/opt/local/include/boost/type_traits/add_const.hpp \
+		/opt/local/include/boost/type_traits/add_volatile.hpp \
+		/opt/local/include/boost/type_traits/make_unsigned.hpp \
+		/opt/local/include/boost/utility/declval.hpp \
+		/opt/local/include/boost/type_traits/is_floating_point.hpp \
+		/opt/local/include/boost/chrono/detail/is_evenly_divisible_by.hpp \
+		/opt/local/include/boost/chrono/time_point.hpp \
+		/opt/local/include/boost/chrono/detail/system.hpp \
+		/opt/local/include/boost/chrono/clock_string.hpp \
+		/opt/local/include/boost/chrono/detail/inlined/chrono.hpp \
+		/opt/local/include/boost/chrono/chrono.hpp \
+		/opt/local/include/boost/chrono/detail/inlined/win/chrono.hpp \
+		/opt/local/include/boost/detail/win/time.hpp \
+		/opt/local/include/boost/detail/win/basic_types.hpp \
+		/opt/local/include/boost/detail/win/timers.hpp \
+		/opt/local/include/boost/detail/win/GetLastError.hpp \
+		/opt/local/include/boost/chrono/detail/inlined/mac/chrono.hpp \
+		/opt/local/include/boost/chrono/detail/inlined/posix/chrono.hpp \
+		/opt/local/include/boost/thread/pthread/thread_data.hpp \
+		/opt/local/include/boost/thread/lock_guard.hpp \
+		/opt/local/include/boost/thread/detail/delete.hpp \
+		/opt/local/include/boost/thread/detail/move.hpp \
+		/opt/local/include/boost/type_traits/decay.hpp \
+		/opt/local/include/boost/type_traits/add_pointer.hpp \
+		/opt/local/include/boost/move/utility.hpp \
+		/opt/local/include/boost/move/detail/config_begin.hpp \
+		/opt/local/include/boost/move/core.hpp \
+		/opt/local/include/boost/move/detail/meta_utils.hpp \
+		/opt/local/include/boost/move/detail/config_end.hpp \
+		/opt/local/include/boost/thread/detail/lockable_wrapper.hpp \
+		/opt/local/include/boost/thread/lock_options.hpp \
+		/opt/local/include/boost/thread/is_locked_by_this_thread.hpp \
+		/opt/local/include/boost/thread/lock_types.hpp \
+		/opt/local/include/boost/thread/lockable_traits.hpp \
+		/opt/local/include/boost/thread/mutex.hpp \
+		/opt/local/include/boost/thread/win32/mutex.hpp \
+		/opt/local/include/boost/thread/win32/basic_timed_mutex.hpp \
+		/opt/local/include/boost/thread/win32/interlocked_read.hpp \
+		/opt/local/include/boost/thread/xtime.hpp \
+		/opt/local/include/boost/date_time/posix_time/conversion.hpp \
+		/opt/local/include/boost/date_time/gregorian/conversion.hpp \
+		/opt/local/include/boost/chrono/ceil.hpp \
+		/opt/local/include/boost/thread/pthread/mutex.hpp \
+		/opt/local/include/boost/thread/pthread/timespec.hpp \
+		/opt/local/include/boost/thread/pthread/pthread_mutex_scoped_lock.hpp \
+		/opt/local/include/boost/thread/pthread/condition_variable_fwd.hpp \
+		/opt/local/include/boost/thread/cv_status.hpp \
+		/opt/local/include/boost/detail/scoped_enum_emulation.hpp \
+		/opt/local/include/boost/enable_shared_from_this.hpp \
+		/opt/local/include/boost/smart_ptr/enable_shared_from_this.hpp \
+		/opt/local/include/boost/smart_ptr/weak_ptr.hpp \
+		/opt/local/include/boost/optional.hpp \
+		/opt/local/include/boost/optional/optional.hpp \
+		/opt/local/include/boost/type_traits/has_nothrow_constructor.hpp \
+		/opt/local/include/boost/type_traits/has_trivial_constructor.hpp \
+		/opt/local/include/boost/detail/reference_content.hpp \
+		/opt/local/include/boost/type_traits/has_nothrow_copy.hpp \
+		/opt/local/include/boost/type_traits/has_trivial_copy.hpp \
+		/opt/local/include/boost/none.hpp \
+		/opt/local/include/boost/none_t.hpp \
+		/opt/local/include/boost/utility/swap.hpp \
+		/opt/local/include/boost/utility/compare_pointees.hpp \
+		/opt/local/include/boost/utility/in_place_factory.hpp \
+		/opt/local/include/boost/utility/detail/in_place_factory_prefix.hpp \
+		/opt/local/include/boost/preprocessor/punctuation/paren.hpp \
+		/opt/local/include/boost/preprocessor/repetition/enum_binary_params.hpp \
+		/opt/local/include/boost/utility/detail/in_place_factory_suffix.hpp \
+		/opt/local/include/boost/optional/optional_fwd.hpp \
+		/opt/local/include/boost/thread/detail/thread.hpp \
+		/opt/local/include/boost/thread/detail/thread_heap_alloc.hpp \
+		/opt/local/include/boost/thread/pthread/thread_heap_alloc.hpp \
+		/opt/local/include/boost/thread/detail/make_tuple_indices.hpp \
+		/opt/local/include/boost/thread/detail/invoke.hpp \
+		/opt/local/include/boost/thread/detail/is_convertible.hpp \
+		/opt/local/include/boost/ref.hpp \
+		/opt/local/include/boost/bind.hpp \
+		/opt/local/include/boost/bind/bind.hpp \
+		/opt/local/include/boost/mem_fn.hpp \
+		/opt/local/include/boost/bind/mem_fn.hpp \
+		/opt/local/include/boost/get_pointer.hpp \
+		/opt/local/include/boost/bind/mem_fn_template.hpp \
+		/opt/local/include/boost/bind/mem_fn_vw.hpp \
+		/opt/local/include/boost/bind/mem_fn_cc.hpp \
+		/opt/local/include/boost/is_placeholder.hpp \
+		/opt/local/include/boost/bind/arg.hpp \
+		/opt/local/include/boost/visit_each.hpp \
+		/opt/local/include/boost/bind/storage.hpp \
+		/opt/local/include/boost/bind/bind_template.hpp \
+		/opt/local/include/boost/bind/bind_cc.hpp \
+		/opt/local/include/boost/bind/bind_mf_cc.hpp \
+		/opt/local/include/boost/bind/bind_mf2_cc.hpp \
+		/opt/local/include/boost/bind/placeholders.hpp \
+		/opt/local/include/boost/io/ios_state.hpp \
+		/opt/local/include/boost/io_fwd.hpp \
+		/opt/local/include/boost/functional/hash.hpp \
+		/opt/local/include/boost/functional/hash/hash.hpp \
+		/opt/local/include/boost/functional/hash/hash_fwd.hpp \
+		/opt/local/include/boost/functional/hash/detail/hash_float.hpp \
+		/opt/local/include/boost/functional/hash/detail/float_functions.hpp \
+		/opt/local/include/boost/functional/hash/detail/limits.hpp \
+		/opt/local/include/boost/integer/static_log2.hpp \
+		/opt/local/include/boost/integer_fwd.hpp \
+		/opt/local/include/boost/functional/hash/extensions.hpp \
+		/opt/local/include/boost/detail/container_fwd.hpp \
+		/opt/local/include/boost/thread/detail/thread_interruption.hpp \
+		/opt/local/include/boost/thread/detail/thread_group.hpp \
+		/opt/local/include/boost/thread/shared_mutex.hpp \
+		/opt/local/include/boost/thread/pthread/shared_mutex.hpp \
+		/opt/local/include/boost/thread/condition_variable.hpp \
+		/opt/local/include/boost/thread/win32/condition_variable.hpp \
+		/opt/local/include/boost/thread/pthread/condition_variable.hpp \
+		/opt/local/include/boost/thread/win32/shared_mutex.hpp \
+		/opt/local/include/boost/thread/v2/thread.hpp \
+		/opt/local/include/boost/thread/once.hpp \
+		/opt/local/include/boost/thread/win32/once.hpp \
+		/opt/local/include/boost/thread/pthread/once.hpp \
+		/opt/local/include/boost/thread/recursive_mutex.hpp \
+		/opt/local/include/boost/thread/win32/recursive_mutex.hpp \
+		/opt/local/include/boost/thread/win32/basic_recursive_mutex.hpp \
+		/opt/local/include/boost/thread/pthread/recursive_mutex.hpp \
+		/opt/local/include/boost/thread/tss.hpp \
+		/opt/local/include/boost/thread/locks.hpp \
+		/opt/local/include/boost/thread/lock_algorithms.hpp \
+		/opt/local/include/boost/thread/barrier.hpp \
+		/opt/local/include/boost/thread/future.hpp \
+		/opt/local/include/boost/thread/detail/async_func.hpp \
+		/opt/local/include/boost/utility/result_of.hpp \
+		/opt/local/include/boost/preprocessor/facilities/intercept.hpp \
+		/opt/local/include/boost/exception_ptr.hpp \
+		/opt/local/include/boost/exception/detail/exception_ptr.hpp \
+		/opt/local/include/boost/exception/info.hpp \
+		/opt/local/include/boost/exception/to_string_stub.hpp \
+		/opt/local/include/boost/exception/to_string.hpp \
+		/opt/local/include/boost/exception/detail/is_output_streamable.hpp \
+		/opt/local/include/boost/exception/detail/object_hex_dump.hpp \
+		/opt/local/include/boost/exception/detail/type_info.hpp \
+		/opt/local/include/boost/units/detail/utility.hpp \
+		/opt/local/include/boost/algorithm/string/replace.hpp \
+		/opt/local/include/boost/algorithm/string/config.hpp \
+		/opt/local/include/boost/range/iterator_range.hpp \
+		/opt/local/include/boost/range/iterator_range_core.hpp \
+		/opt/local/include/boost/iterator/iterator_traits.hpp \
+		/opt/local/include/boost/detail/iterator.hpp \
+		/opt/local/include/boost/type_traits/remove_const.hpp \
+		/opt/local/include/boost/type_traits/msvc/remove_const.hpp \
+		/opt/local/include/boost/type_traits/remove_pointer.hpp \
+		/opt/local/include/boost/type_traits/msvc/remove_pointer.hpp \
+		/opt/local/include/boost/iterator/iterator_facade.hpp \
+		/opt/local/include/boost/iterator/interoperable.hpp \
+		/opt/local/include/boost/iterator/detail/config_def.hpp \
+		/opt/local/include/boost/iterator/detail/config_undef.hpp \
+		/opt/local/include/boost/iterator/detail/facade_iterator_category.hpp \
+		/opt/local/include/boost/iterator/iterator_categories.hpp \
+		/opt/local/include/boost/detail/indirect_traits.hpp \
+		/opt/local/include/boost/detail/is_function_ref_tester.hpp \
+		/opt/local/include/boost/iterator/detail/enable_if.hpp \
+		/opt/local/include/boost/range/functions.hpp \
+		/opt/local/include/boost/range/begin.hpp \
+		/opt/local/include/boost/range/config.hpp \
+		/opt/local/include/boost/range/detail/begin.hpp \
+		/opt/local/include/boost/range/iterator.hpp \
+		/opt/local/include/boost/range/mutable_iterator.hpp \
+		/opt/local/include/boost/range/detail/iterator.hpp \
+		/opt/local/include/boost/range/detail/common.hpp \
+		/opt/local/include/boost/range/detail/sfinae.hpp \
+		/opt/local/include/boost/range/detail/remove_extent.hpp \
+		/opt/local/include/boost/range/detail/extract_optional_type.hpp \
+		/opt/local/include/boost/range/const_iterator.hpp \
+		/opt/local/include/boost/range/detail/const_iterator.hpp \
+		/opt/local/include/boost/range/value_type.hpp \
+		/opt/local/include/boost/range/end.hpp \
+		/opt/local/include/boost/range/detail/end.hpp \
+		/opt/local/include/boost/range/detail/vc6/end.hpp \
+		/opt/local/include/boost/range/detail/implementation_help.hpp \
+		/opt/local/include/boost/range/result_iterator.hpp \
+		/opt/local/include/boost/range/size.hpp \
+		/opt/local/include/boost/range/size_type.hpp \
+		/opt/local/include/boost/range/difference_type.hpp \
+		/opt/local/include/boost/range/detail/size_type.hpp \
+		/opt/local/include/boost/range/distance.hpp \
+		/opt/local/include/boost/range/empty.hpp \
+		/opt/local/include/boost/range/rbegin.hpp \
+		/opt/local/include/boost/range/reverse_iterator.hpp \
+		/opt/local/include/boost/iterator/reverse_iterator.hpp \
+		/opt/local/include/boost/next_prior.hpp \
+		/opt/local/include/boost/iterator/iterator_adaptor.hpp \
+		/opt/local/include/boost/range/rend.hpp \
+		/opt/local/include/boost/range/algorithm/equal.hpp \
+		/opt/local/include/boost/range/concepts.hpp \
+		/opt/local/include/boost/concept_check.hpp \
+		/opt/local/include/boost/concept/assert.hpp \
+		/opt/local/include/boost/concept/detail/msvc.hpp \
+		/opt/local/include/boost/concept/detail/backward_compatibility.hpp \
+		/opt/local/include/boost/concept/detail/has_constraints.hpp \
+		/opt/local/include/boost/concept/detail/borland.hpp \
+		/opt/local/include/boost/concept/detail/general.hpp \
+		/opt/local/include/boost/type_traits/conversion_traits.hpp \
+		/opt/local/include/boost/concept/usage.hpp \
+		/opt/local/include/boost/concept/detail/concept_def.hpp \
+		/opt/local/include/boost/concept/detail/concept_undef.hpp \
+		/opt/local/include/boost/iterator/iterator_concepts.hpp \
+		/opt/local/include/boost/range/detail/misc_concept.hpp \
+		/opt/local/include/boost/range/detail/safe_bool.hpp \
+		/opt/local/include/boost/range/iterator_range_io.hpp \
+		/opt/local/include/boost/algorithm/string/find_format.hpp \
+		/opt/local/include/boost/range/as_literal.hpp \
+		/opt/local/include/boost/range/detail/as_literal.hpp \
+		/opt/local/include/boost/range/detail/detail_str.hpp \
+		/opt/local/include/boost/range/detail/value_type.hpp \
+		/opt/local/include/boost/range/detail/str_types.hpp \
+		/opt/local/include/boost/algorithm/string/concept.hpp \
+		/opt/local/include/boost/algorithm/string/detail/find_format.hpp \
+		/opt/local/include/boost/algorithm/string/detail/find_format_store.hpp \
+		/opt/local/include/boost/algorithm/string/detail/replace_storage.hpp \
+		/opt/local/include/boost/algorithm/string/sequence_traits.hpp \
+		/opt/local/include/boost/algorithm/string/yes_no_type.hpp \
+		/opt/local/include/boost/algorithm/string/detail/sequence.hpp \
+		/opt/local/include/boost/algorithm/string/detail/find_format_all.hpp \
+		/opt/local/include/boost/algorithm/string/finder.hpp \
+		/opt/local/include/boost/algorithm/string/constants.hpp \
+		/opt/local/include/boost/algorithm/string/detail/finder.hpp \
+		/opt/local/include/boost/algorithm/string/compare.hpp \
+		/opt/local/include/boost/algorithm/string/formatter.hpp \
+		/opt/local/include/boost/algorithm/string/detail/formatter.hpp \
+		/opt/local/include/boost/algorithm/string/detail/util.hpp \
+		/opt/local/include/boost/exception/detail/error_info_impl.hpp \
+		/opt/local/include/boost/exception/diagnostic_information.hpp \
+		/opt/local/include/boost/exception/get_error_info.hpp \
+		/opt/local/include/boost/exception/current_exception_cast.hpp \
+		/opt/local/include/boost/exception/detail/clone_current_exception.hpp \
+		/opt/local/include/boost/scoped_ptr.hpp \
+		/opt/local/include/boost/smart_ptr/scoped_ptr.hpp \
+		/opt/local/include/boost/function.hpp \
+		/opt/local/include/boost/function/detail/prologue.hpp \
+		/opt/local/include/boost/function/function_base.hpp \
+		/opt/local/include/boost/integer.hpp \
+		/opt/local/include/boost/type_traits/has_trivial_destructor.hpp \
+		/opt/local/include/boost/function_equal.hpp \
+		/opt/local/include/boost/function/function_fwd.hpp \
+		/opt/local/include/boost/preprocessor/enum.hpp \
+		/opt/local/include/boost/function/function0.hpp \
+		/opt/local/include/boost/function/detail/maybe_include.hpp \
+		/opt/local/include/boost/function/function_template.hpp \
+		/opt/local/include/boost/function/function1.hpp \
+		/opt/local/include/boost/function/function2.hpp \
+		/opt/local/include/boost/function/function3.hpp \
+		/opt/local/include/boost/function/function4.hpp \
+		/opt/local/include/boost/function/function5.hpp \
+		/opt/local/include/boost/function/function6.hpp \
+		/opt/local/include/boost/function/function7.hpp \
+		/opt/local/include/boost/function/function8.hpp \
+		/opt/local/include/boost/function/function9.hpp \
+		/opt/local/include/boost/function/function10.hpp \
+		/opt/local/include/boost/scoped_array.hpp \
+		/opt/local/include/boost/smart_ptr/scoped_array.hpp \
+		/opt/local/include/boost/thread/future_error_code.hpp \
+		/opt/local/include/boost/thread/detail/memory.hpp \
+		/opt/local/include/boost/container/allocator_traits.hpp \
+		/opt/local/include/boost/container/detail/config_begin.hpp \
+		/opt/local/include/boost/container/detail/workaround.hpp \
+		/opt/local/include/boost/container/detail/config_end.hpp \
+		/opt/local/include/boost/intrusive/pointer_traits.hpp \
+		/opt/local/include/boost/intrusive/detail/config_begin.hpp \
+		/opt/local/include/boost/intrusive/detail/workaround.hpp \
+		/opt/local/include/boost/intrusive/detail/config_end.hpp \
+		/opt/local/include/boost/intrusive/detail/memory_util.hpp \
+		/opt/local/include/boost/intrusive/detail/mpl.hpp \
+		/opt/local/include/boost/intrusive/detail/preprocessor.hpp \
+		/opt/local/include/boost/preprocessor/punctuation/paren_if.hpp \
+		/opt/local/include/boost/preprocessor/repetition/enum_shifted.hpp \
+		/opt/local/include/boost/intrusive/detail/has_member_function_callable_with.hpp \
+		/opt/local/include/boost/move/move.hpp \
+		/opt/local/include/boost/move/iterator.hpp \
+		/opt/local/include/boost/move/traits.hpp \
+		/opt/local/include/boost/move/algorithm.hpp \
+		/opt/local/include/boost/container/detail/memory_util.hpp \
+		/opt/local/include/boost/container/detail/preprocessor.hpp \
+		/opt/local/include/boost/container/detail/mpl.hpp \
+		/opt/local/include/boost/container/scoped_allocator.hpp \
+		/opt/local/include/boost/container/scoped_allocator_fwd.hpp \
+		/opt/local/include/boost/container/detail/type_traits.hpp \
+		/opt/local/include/boost/container/detail/utilities.hpp \
+		/opt/local/include/boost/container/detail/pair.hpp \
+		../../../../Fit/Factory/inc/MinimizerFactory.h \
+		../../../../Core/Fitting/inc/IMinimizer.h \
+		../../../../Core/FormFactors/inc/FormFactorPrism3.h \
+		../../../../Core/Tools/inc/IStochasticParameter.h \
+		../../../../Core/Tools/inc/MathFunctions.h \
+		/opt/local/include/gsl/gsl_sf_bessel.h \
+		/opt/local/include/gsl/gsl_mode.h \
+		/opt/local/include/gsl/gsl_inline.h \
+		/opt/local/include/gsl/gsl_precision.h \
+		/opt/local/include/gsl/gsl_types.h \
+		/opt/local/include/gsl/gsl_sf_result.h \
+		/opt/local/include/gsl/gsl_sf_trig.h \
+		/opt/local/include/gsl/gsl_sf_expint.h \
+		/opt/local/include/gsl/gsl_integration.h \
+		/opt/local/include/gsl/gsl_math.h \
+		/opt/local/include/gsl/gsl_sys.h \
+		/opt/local/include/gsl/gsl_machine.h \
+		/opt/local/include/gsl/gsl_nan.h \
+		/opt/local/include/gsl/gsl_pow_int.h \
+		/opt/local/include/gsl/gsl_minmax.h \
+		../../../../Core/Tools/inc/Utils.h \
+		/opt/local/include/boost/unordered_map.hpp \
+		/opt/local/include/boost/unordered/unordered_map.hpp \
+		/opt/local/include/boost/unordered/unordered_map_fwd.hpp \
+		/opt/local/include/boost/functional/hash_fwd.hpp \
+		/opt/local/include/boost/unordered/detail/fwd.hpp \
+		/opt/local/include/boost/unordered/detail/equivalent.hpp \
+		/opt/local/include/boost/unordered/detail/table.hpp \
+		/opt/local/include/boost/unordered/detail/buckets.hpp \
+		/opt/local/include/boost/unordered/detail/util.hpp \
+		/opt/local/include/boost/type_traits/is_empty.hpp \
+		/opt/local/include/boost/detail/select_type.hpp \
+		/opt/local/include/boost/swap.hpp \
+		/opt/local/include/boost/unordered/detail/allocate.hpp \
+		/opt/local/include/boost/tuple/tuple.hpp \
+		/opt/local/include/boost/tuple/detail/tuple_basic_no_partial_spec.hpp \
+		/opt/local/include/boost/type_traits.hpp \
+		/opt/local/include/boost/type_traits/add_cv.hpp \
+		/opt/local/include/boost/type_traits/aligned_storage.hpp \
+		/opt/local/include/boost/aligned_storage.hpp \
+		/opt/local/include/boost/type_traits/conditional.hpp \
+		/opt/local/include/boost/type_traits/extent.hpp \
+		/opt/local/include/boost/type_traits/floating_point_promotion.hpp \
+		/opt/local/include/boost/mpl/multiplies.hpp \
+		/opt/local/include/boost/mpl/times.hpp \
+		/opt/local/include/boost/mpl/vector.hpp \
+		/opt/local/include/boost/mpl/limits/vector.hpp \
+		/opt/local/include/boost/mpl/aux_/sequence_wrapper.hpp \
+		/opt/local/include/boost/preprocessor/enum_params_with_a_default.hpp \
+		/opt/local/include/boost/preprocessor/repetition/enum_params_with_a_default.hpp \
+		/opt/local/include/boost/type_traits/function_traits.hpp \
+		/opt/local/include/boost/type_traits/has_new_operator.hpp \
+		/opt/local/include/boost/type_traits/has_nothrow_assign.hpp \
+		/opt/local/include/boost/type_traits/has_trivial_assign.hpp \
+		/opt/local/include/boost/type_traits/has_nothrow_destructor.hpp \
+		/opt/local/include/boost/type_traits/has_operator.hpp \
+		/opt/local/include/boost/type_traits/has_bit_and.hpp \
+		/opt/local/include/boost/type_traits/detail/has_binary_operator.hpp \
+		/opt/local/include/boost/type_traits/has_bit_and_assign.hpp \
+		/opt/local/include/boost/type_traits/has_bit_or.hpp \
+		/opt/local/include/boost/type_traits/has_bit_or_assign.hpp \
+		/opt/local/include/boost/type_traits/has_bit_xor.hpp \
+		/opt/local/include/boost/type_traits/has_bit_xor_assign.hpp \
+		/opt/local/include/boost/type_traits/has_complement.hpp \
+		/opt/local/include/boost/type_traits/detail/has_prefix_operator.hpp \
+		/opt/local/include/boost/type_traits/has_dereference.hpp \
+		/opt/local/include/boost/type_traits/has_divides.hpp \
+		/opt/local/include/boost/type_traits/has_divides_assign.hpp \
+		/opt/local/include/boost/type_traits/has_equal_to.hpp \
+		/opt/local/include/boost/type_traits/has_greater.hpp \
+		/opt/local/include/boost/type_traits/has_greater_equal.hpp \
+		/opt/local/include/boost/type_traits/has_left_shift.hpp \
+		/opt/local/include/boost/type_traits/has_left_shift_assign.hpp \
+		/opt/local/include/boost/type_traits/has_less.hpp \
+		/opt/local/include/boost/type_traits/has_less_equal.hpp \
+		/opt/local/include/boost/type_traits/has_logical_and.hpp \
+		/opt/local/include/boost/type_traits/has_logical_not.hpp \
+		/opt/local/include/boost/type_traits/has_logical_or.hpp \
+		/opt/local/include/boost/type_traits/has_minus.hpp \
+		/opt/local/include/boost/type_traits/has_minus_assign.hpp \
+		/opt/local/include/boost/type_traits/has_modulus.hpp \
+		/opt/local/include/boost/type_traits/has_modulus_assign.hpp \
+		/opt/local/include/boost/type_traits/has_multiplies.hpp \
+		/opt/local/include/boost/type_traits/has_multiplies_assign.hpp \
+		/opt/local/include/boost/type_traits/has_negate.hpp \
+		/opt/local/include/boost/type_traits/has_not_equal_to.hpp \
+		/opt/local/include/boost/type_traits/has_plus.hpp \
+		/opt/local/include/boost/type_traits/has_plus_assign.hpp \
+		/opt/local/include/boost/type_traits/has_post_decrement.hpp \
+		/opt/local/include/boost/type_traits/detail/has_postfix_operator.hpp \
+		/opt/local/include/boost/type_traits/has_post_increment.hpp \
+		/opt/local/include/boost/type_traits/has_pre_decrement.hpp \
+		/opt/local/include/boost/type_traits/has_pre_increment.hpp \
+		/opt/local/include/boost/type_traits/has_right_shift.hpp \
+		/opt/local/include/boost/type_traits/has_right_shift_assign.hpp \
+		/opt/local/include/boost/type_traits/has_unary_minus.hpp \
+		/opt/local/include/boost/type_traits/has_unary_plus.hpp \
+		/opt/local/include/boost/type_traits/has_virtual_destructor.hpp \
+		/opt/local/include/boost/type_traits/is_complex.hpp \
+		/opt/local/include/boost/type_traits/is_compound.hpp \
+		/opt/local/include/boost/type_traits/is_member_object_pointer.hpp \
+		/opt/local/include/boost/type_traits/is_object.hpp \
+		/opt/local/include/boost/type_traits/is_stateless.hpp \
+		/opt/local/include/boost/type_traits/is_virtual_base_of.hpp \
+		/opt/local/include/boost/type_traits/rank.hpp \
+		/opt/local/include/boost/type_traits/remove_extent.hpp \
+		/opt/local/include/boost/type_traits/msvc/remove_extent.hpp \
+		/opt/local/include/boost/type_traits/remove_all_extents.hpp \
+		/opt/local/include/boost/type_traits/msvc/remove_all_extents.hpp \
+		/opt/local/include/boost/type_traits/remove_volatile.hpp \
+		/opt/local/include/boost/type_traits/msvc/remove_volatile.hpp \
+		/opt/local/include/boost/type_traits/integral_promotion.hpp \
+		/opt/local/include/boost/type_traits/promote.hpp \
+		/opt/local/include/boost/tuple/detail/tuple_basic.hpp \
+		/opt/local/include/boost/type_traits/cv_traits.hpp \
+		/opt/local/include/boost/pointer_to_other.hpp \
+		/opt/local/include/boost/unordered/detail/extract_key.hpp \
+		/opt/local/include/boost/unordered/detail/unique.hpp
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o .obj/debug/SampleBuilder.o SampleBuilder.cpp
 
 ####### Install
diff --git a/Tests/FunctionalTests/TestFit/TestFit02/SampleBuilder.cpp b/Tests/FunctionalTests/TestFit/TestFit02/SampleBuilder.cpp
index 19ce61ac76e67299602ecb47dab1e8fcd03afff6..067d42e973514686e93f17caea4fa501f5854cfb 100644
--- a/Tests/FunctionalTests/TestFit/TestFit02/SampleBuilder.cpp
+++ b/Tests/FunctionalTests/TestFit/TestFit02/SampleBuilder.cpp
@@ -11,6 +11,7 @@
 #include "MathFunctions.h"
 #include "Utils.h"
 
+using namespace FunctionalTests;
 
 // ----------------------------------------------------------------------------
 // Sample builder to build mixture of cylinders and prisms on top of substrate
diff --git a/Tests/FunctionalTests/TestFit/TestFit02/SampleBuilder.h b/Tests/FunctionalTests/TestFit/TestFit02/SampleBuilder.h
index 3c91c214f0c6f5213fc42094a6d1224b1a8a7565..3d6490006dc57c0d44e154599241527968264561 100644
--- a/Tests/FunctionalTests/TestFit/TestFit02/SampleBuilder.h
+++ b/Tests/FunctionalTests/TestFit/TestFit02/SampleBuilder.h
@@ -3,7 +3,10 @@
 
 #include "ISampleBuilder.h"
 
-//! builds sample using set of input parameters
+namespace FunctionalTests {
+
+//! Builds sample using set of input parameters.
+//! Mixture of cylinders and prisms on top of substrate.
 class SampleBuilder : public ISampleBuilder
 {
 public:
@@ -21,6 +24,6 @@ private:
     double m_cylinder_ratio;
 };
 
-
+}
 
 #endif // SAMPLEBUILDER_H
diff --git a/Tests/FunctionalTests/TestPyCore/README b/Tests/FunctionalTests/TestPyCore/README
index 16846c0dd14eb39705fc2979a59f5efc8de830ac..ef59d5e0a8a2430d293e51cb6d01b746b428586e 100644
--- a/Tests/FunctionalTests/TestPyCore/README
+++ b/Tests/FunctionalTests/TestPyCore/README
@@ -10,14 +10,15 @@ To run tests
 python TestPyCore.py
 
 List of tests
-IsGISAXS01 - Mixture of cylinders and prisms without interference (IsGISAXS example #1)
-IsGISAXS02 - Mixture cylinder particles with different size distribution (IsGISAXS example #2)
-IsGISAXS03 - Cylinder formfactor in BA and DWBA (IsGISAXS example #3)
-IsGISAXS04 - 1D and 2D paracrystal (IsGISAXS example #4)
-IsGISAXS06 - 2D lattice with different disorder (IsGISAXS example #6)
-IsGISAXS07 - Mixture of different particles defined in morphology file (IsGISAXS example #7)
-IsGISAXS08 - 2DDL paracrystal (IsGISAXS example #8)
-IsGISAXS09 - Pyramids on top of substrate - Rotated pyramids on top of substrate (IsGISAXS example #9)
-IsGISAXS10 - Cylinders with interference on top of substrate (IsGISAXS example #10)
-IsGISAXS11 - Core shell nanoparticles (IsGISAXS example #11)
-IsGISAXS15 - Size spacing correlation approximation (IsGISAXS example #15)
+IsGISAXS01   - Mixture of cylinders and prisms without interference (IsGISAXS example #1)
+IsGISAXS02   - Mixture cylinder particles with different size distribution (IsGISAXS example #2)
+IsGISAXS03   - Cylinder formfactor in BA and DWBA (IsGISAXS example #3)
+IsGISAXS04   - 1D and 2D paracrystal (IsGISAXS example #4)
+IsGISAXS06   - 2D lattice with different disorder (IsGISAXS example #6)
+IsGISAXS07   - Mixture of different particles defined in morphology file (IsGISAXS example #7)
+IsGISAXS08   - 2DDL paracrystal (IsGISAXS example #8)
+IsGISAXS09   - Pyramids on top of substrate - Rotated pyramids on top of substrate (IsGISAXS example #9)
+IsGISAXS10   - Cylinders with interference on top of substrate (IsGISAXS example #10)
+IsGISAXS11   - Core shell nanoparticles (IsGISAXS example #11)
+IsGISAXS15   - Size spacing correlation approximation (IsGISAXS example #15)
+MesoCrystal1 - Meso crystal simulation