Merge pull request #102 from causten/s3c3

Updating base build with sprint 3 candidate 3