Version 0.5

Change-Id: Id25a663e6eb3dbbd4a3ba62590ebd5dcc2813783