Merge branch 'hotfix/0.8.1'

* hotfix/0.8.1:
  if function and default to vars
create cupcake namespace for vars
Merge branch 'hotfix/0.8.2' into develop

* hotfix/0.8.2:
  create cupcake namespace for vars