Changed my-subproject from parent
Changes from parent and my-subproject
Merge pull request #1 from strahlex/vinny-some-awesome-work

Vinny some awesome work