Merge pull request #133 from causten/skeleton

Pickup Sprint4 changes for skeleton