Added validation
new release 0.3.18