corrected output path and minor changes
Authored by: benkick 2014-10-30
Parent: [r30825]
Child: [r30827]