Fixes #43 - optional validation