v0.3.7
Merge branch 'dev'