Add argument validation
Merge branch 'dev'