for sam
Merge pull request #34 from snickers2029/develop

for sam