Merge branch 'feature/empty-args'