Upped version to 0.6
Merge versions