Merge pull request #5 from juju2013/master

adaptation for large source tree