Initial merge
Merged in the SimpleSample stuff