Version 0.6

Change-Id: I95999f0318dda8ab1a4f99117eaf68271c38c6a6