Merge pull request #5 from mgeiss/develop

freaking cluster builder with user and pwd