Some errors corrected. Build passed. 0.6.0