Updates made for 0.6.2-beta