Fixed null, string and less than 0 bugs
Merge branch 'dev' into max_branch