Return None/Null instead of 0 for empty input

Return None/Null instead of 0 for empty input #46