Improved Tiled support, fixes #5