Merge pull request #17 from cloudify-cosmo/master

CFY-1755-start-phase
Merge pull request #19 from cloudify-cosmo/CFY-1755-start-phase

Merge pull request #17 from cloudify-cosmo/master