Merge branch 'release/0.3.6'
Merge tag '0.3.6' into develop

Tagging version 0.3.6 0.3.6