Omar made small modification to validation implementation [issue #83]