handle if criteria null
Merge pull request #47 from januarsiregar/master

handle if criteria null
misc updates
Merge pull request #48 from reekoheek/master

misc updates
fix some cs