#20 Adding possibility to select output mode