final commit of 0.6.3