SAM Default Inputs
Merge branch 'jon' into webice