take empty cells into account

Thanks to Michael Brand and Eric Abrahamsen for pointing this
small fixes
Merge branch 'master' of https://github.com/tbanel/orgaggregate