0.3.7
Merge branch 'release/0.3.7' into develop