Added zero support
more tests
more info