Added possibility to ignore null values
Minor fixes