Johannes exelent optimization
Merge pull request #63 from mayabrandi/develop_samples_class

Johannes exelent optimization