revert the revert, add back in nil dict value fix
Merge pull request #4 from dav/master

revert the revert, add back in nil dict value fix