Merge pull request #213 from eile/master

Improved version for #212
Extend SubProject