Minor import changes
Merged with upstream
Added Text Validation
Merge remote-tracking branch 'origin/master'