Merge branch 'release/0.0.2' into develop
Merge branch 'master' into develop

* master:
  Revert "whatever"
  whatever
  Dirty files around
  Class files dirty stuff around
dev
Merge commit '6aad032f7c9d611f487816dd6c8dcf1db81af57c'