Fixed issue #5 and fixed incorrect uses of equals(null)
a
Fixed issue #5 and incorrect uses of equals(null).