Merge branch 'release/0.2.0' into develop

* release/0.2.0:
  0.2.0
added basic setup
Merge branch 'develop' of github.com:Kunstmaan/cupcake into develop

* 'develop' of github.com:Kunstmaan/cupcake:
  0.2.0
0.3.0
Merge branch 'release/0.3.0' into develop

* release/0.3.0:
  0.3.0
Merge pull request #1 from Kunstmaan/develop

Develop