first commit
added locale check and script check
merged conflicts