added GenPw option
text adjust
catch empty entity result
Merge remote-tracking branch 'origin/master'