Enhancements:
Masked field for password entry.
Error handling
Merge origin/master