Fix issue #93
Merge pull request #94 from Sjeanpierre/validation_fix

Fix issue #93