refs cinovo/cloudconductor-server/issues/54
refs cinovo/cloudconductor-server/issues/54
Merge pull request #2 from cinovo/54

refs #54