Added argument validation (#5)