Fixed segfault involving pass a null pointer into function
random .d's
Merge branch 'master' of github.com:Nevinli158/118P2