closes #107
Merge branch 'bug/107-nas-order-id-name' into dev