Revert "Fixed issues"
Merge pull request #7 from Mirantis/revert-6-master

Revert "Fixed issues"