updated to 0.4 final