Multiple Fixes/Changes
Merge remote-tracking branch 'upstream/master'
Changed OutputPath back after merge