Merge branch 'develop'
0.3.0
0.3.1
Revert "0.3.1"

This reverts commit 159edfcefde3c67706f3b7cebbcedde52e73f9a9.
Merge branch 'master' into develop