Added better login and password hiding
Merge branch 'dev'
Changed namespace name