Only dereference the args hash when its defined
Add required files, update changes and bump version
Merge branch 'args_fix' into develop