The pull request with all the code.

same here for the null problem