aligned login credentials
some minor design changes
Merge pull request #11 from wick-ed/master

diff reviewed
bugfix: malfunctioned use statement
Merge pull request #12 from wick-ed/master

diff reviewed/tested with 0.5.9beta1