Robustness improvements for SubProject
Merge pull request #250 from eile/master

Robustness improvements for SubProject