Merge branch 'release/0.4.0' into develop
Revert "Improvement to custom storage."

This reverts commit 6f185ac7398f30653dff9403d5ebf5539d222f4c.
Updated todo.
Bumped version.
Pegged python version.
Merge branch 'release/0.4.1'