Minor fixes
Merge pull request #22 from cloudify-cosmo/Use-ctx

Minor fixes