Bump for version 0.4
Merged Release-0.4 to develop