Fixing https://code.google.com/p/pythongrid/issues/detail?id=4 + small changes