cleaning up PSUL and making it easy to do the 20158 switch
Merge pull request #390 from mayabrandi/develop_samples_class

cleaning up PSUL and making it easy to do the 20158 switch