inputs from samson
Merge pull request #39 from JacobKorn/samson_input

inputs from samson