Merge pull request #5 from Mirantis/master

pull upstream changes
small fixes after functional tests result
Merge pull request #6 from Mirantis/master

pull from master
last merge fix
pep8 rules were fixed
duplicated code was removed
small refactoring
Merge pull request #50 from dukhlov/master

fixes after functional testing