Updating master to use latest common.
Merge pull request #2 from joshsloat/MergeCommonBranch

Updating master to use latest common.