Bumping version and updating CHANGELOG for v0.3.6
Merge branch 'release/v0.3.6' into develop

* release/v0.3.6:
  Bumping version and updating CHANGELOG for v0.3.6