Add directory selector
Merge branch 'master' into package
Package 0.3