modified object orientet login-script
Merge origin/master