+ Added validation (issue #175)