Added validation add feedback issue 65
Merge remote-tracking branch 'origin/master'