Added geometry detection per #20