Merge pull request #495 from hhovsepy/sam-1.3

correct class is imported
Merge pull request #496 from hhovsepy/sam-1.3

update separately, for some RHEL conflict is shown
new template
fixed