Merge pull request #13 from mgeiss/develop

added user and pwd handling