Feature/omit nulls from map

Closes #150