Fix a silly bug
Merge branch 'release/1.0.0' into develop

* release/1.0.0:
  Fix a silly bug
Add some fun
Add some more fun
Merge branch 'feature/AddSomeFun' into develop

* feature/AddSomeFun:
  Add some more fun