Merge pull request #20 from Vhati/master

Data Entry and Multi-Platform Madness
Merge remote-tracking branch 'upstream/master'
Added more Validation nags