WIP
Added argument validation (#5)
Merge branch 'feature/arg-validation' into develop