Merge pull request #94 from vexxhost/improve-staffeln

Improve openstack user handling