fixed #26
Merge branch 'bug/26-nas-command-line-tool' into dev