changed to support cfse and sam
Merge pull request #166 from hhovsepy/master

changed to support cfse and sam