Removed the change for 0.6 as it was not ready. Added verson 0.5.2