Merge branch 'hotfix/0.2.0-1'

* hotfix/0.2.0-1:
  Fixed issue with not having name defined.
A bit of housekeeping.
Performance upgrades for the internal wizard.
Added file with TODOs.
Merge branch 'develop' into hotfix/0.2.0-2

* develop:
  Added file with TODOs.
  Performance upgrades for the internal wizard.
  A bit of housekeeping.
Merge branch 'hotfix/0.2.0-2' into develop

* hotfix/0.2.0-2: