Revert "0.3.1.0"

This reverts commit 703a36f71fc5e7af5dd857a91dcaa98ce0c044d5.
Revert "Revert "0.3.1.0""

This reverts commit 608625684d0d49a6edd66e0374d27b9bc4831ce9.
0.3.4