final commit for 0.3