Version 0.4 final updates. All tests pass