fixed #27
Merge branch 'bug/27-butler-template-file-names' into dev
fixed #28
Merge branch 'bug/28-wrong-nas-query' into dev