Added base dir
Merge branch 'refs/heads/feature-jadeBaseDir'

* refs/heads/feature-jadeBaseDir:
  Added base dir