Version 0.4

Change-Id: I228a2ee2589b34e27bfaed5781d91f5fdac0eddc