Add argument checking
Merge branch 'feature-add-argument-checking' into develop