added ability to pass null arguments
Merge branch 'develop-jake' into develop