issue #49 - Resolve catalog
Add tests for #49
Fix #49 - Resolve catalog
issue #49 - fix impact on openstack commands
Merge pull request #66 from ggiamarchi/issue#49

Merge #49 looks good