separating functions and classes
Merge pull request #394 from mayabrandi/develop_samples_class

separating functions and classes
resolved merging conflict