Resolved conflicts with Kheang's pull request.

no failing tests!