fixed #114
Merge branch 'bug/114-wrong-nas-query' into dev
fixed #115
Merge branch 'bug/115-butler-ausgabeformat' into dev