lergo-181 validation
Merge pull request #92 from lergo/lergo-181-validation

lergo-181 validation