Added option to keep existing _output dir contents
Merge branch 'release/0.0.4'